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

Dmitry V. Levin ldv@altlinux.org
Tue Mar 20 23:20:00 GMT 2018

On Wed, Mar 21, 2018 at 12:03:53AM +0100, Mark Wielaard wrote:
> 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.

The advantage of adding .gitattributes file to repository is that
no gitconfig setup is needed at all, just git-merge-changelog
has to be made available in $PATH.

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 801 bytes
Desc: not available
URL: <http://sourceware.org/pipermail/elfutils-devel/attachments/20180320/869475f0/attachment.sig>

More information about the Elfutils-devel mailing list