git-merge-changelog

Bruno Haible’s git merge driver for GNU-style ChangeLog files (available in gnulib) is really useful for those of us who prefer to document changes as we go along rather than all at once when committing them.  Paolo Bonzini has posted a script for packaging it into a tarball.

Unfortunately it doesn’t seem to cope very well with having multiple ChangeLog entries added on the same date without separate date stamps, and I don’t know how to tell emacs to always add a new date stamp line when using it to add ChangeLog entries (C-x 4 a).

One Response to “git-merge-changelog”

  1. [...] files and git is not so good at merging them. For a while I played around with gnulib’s git-merge-changelog which made merges really easy. It worked fairly well, but now I’m bored of documenting my [...]