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

Mark Wielaard mark@klomp.org
Wed Mar 21 00:16:00 GMT 2018


On Wed, Mar 21, 2018 at 02:20:51AM +0300, Dmitry V. Levin wrote:
> 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.

O, interesting. That doesn't seem to be documented anywhere.
So, when git sees merge-changelog as custom merge command and
there is no custom merge definition, then it will try to execute
git merge-changelog, which will invoke git-merge-changelog from
the PATH?

Could you add this explanation to the commit message?
And a brief comment about git-merge-changelog coming from gnulib?

Thanks,

Mark



More information about the Elfutils-devel mailing list