[PATCH] Specify a custom git merge driver for ChangeLog files

Mark Wielaard mark@klomp.org
Tue Mar 20 23:03:00 GMT 2018

I am not against this, but it could use a bit more documentation
in at least the commit message, so people know what they should
setup in their gitconfig.

Also isn't it better to have something like the following
in your local ~/.gitconfig:

        attributesfile = ~/.gitattributes

And then have the ChangeLog merge=merge-changelog line
in ~/.gitattributes?



More information about the Elfutils-devel mailing list