This is the mail archive of the
elfutils-devel@sourceware.org
mailing list for the elfutils project.
Re: [PATCH] Specify a custom git merge driver for ChangeLog files
- From: Mark Wielaard <mark at klomp dot org>
- To: elfutils-devel at sourceware dot org
- Date: Wed, 21 Mar 2018 00:03:53 +0100
- Subject: Re: [PATCH] Specify a custom git merge driver for ChangeLog files
- References: <20180319183335.GA23327@altlinux.org>
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:
[core]
attributesfile = ~/.gitattributes
And then have the ChangeLog merge=merge-changelog line
in ~/.gitattributes?
Cheers,
Mark