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

2018-03-20 Thread Mark Wielaard
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. >

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

2018-03-20 Thread Dmitry V. Levin
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. >

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

2018-03-20 Thread Dmitry V. Levin
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 gitco

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

2018-03-20 Thread Mark Wielaard
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 th