git ChangeLog merge driver

I've found this so useful on autoconf, when managing multiple topic branches with ChangeLog entries, that I'd like to commit it in libtool. It's particularly important if you use 'git config branch.master.rebase true' and check in ChangeLog entries as you go. Any objections? The embedded

Re: git ChangeLog merge driver

Hi Eric, * Eric Blake wrote on Wed, Apr 16, 2008 at 10:57:12PM CEST: Subject: [PATCH] Make ChangeLog merges easier. * .gitattributes: New file. * HACKING: Mention how it helps. OK, thanks! Cheers, Ralf