git vs ChangeLog

[Roland McGrath]

Mark Wielaard has a handy blog entry describing how to use gnulib's
git-merge-changelog tool to make 'git rebase' and 'git merge' far
less annoying when dealing with ChangeLog files:

http://gnu.wildebeest.org/blog/mjw/2012/03/16/automagically-merging-changelog-files-with-mercurial-or-git/

There are surely other such write-ups around, but this is the first
one I found today (and I don't recall at all where I got the info
for doing it myself many moons ago).  Someone with more round tuits
(and/or tolerance for wiki-writing) than I have should put the
details on the glibc wiki, refined to just what matters for our git
repository.  Note that you want not just a "ChangeLog" pattern but
also a "*/ChangeLog*" to catch nptl/ChangeLog, ports/ChangeLog.foo, etc.

Also, I personally use the two attached scripts so that 'git show-gnu'
is the handy way to produce the standard format for posting a patch
once you've done a git commit on a local branch.


Thanks,
Roland


-------------- next part --------------
A non-text attachment was scrubbed...
Name: extract-changelog-from-diff
Type: text/x-shell-script
Size: 549 bytes
Desc: script for extracting ChangeLog entries from a patch
URL: <http://sourceware.org/pipermail/libc-alpha/attachments/20120726/48d39858/attachment.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: git-show-gnu
Type: text/x-shell-script
Size: 181 bytes
Desc: git show-gnu subcommand implementation
URL: <http://sourceware.org/pipermail/libc-alpha/attachments/20120726/48d39858/attachment-0001.bin>