This is the mail archive of the elfutils-devel@sourceware.org mailing list for the elfutils project.

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Other format:	[Raw text]

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

From: "Dmitry V. Levin" <ldv at altlinux dot org>
To: elfutils-devel at sourceware dot org
Date: Wed, 21 Mar 2018 02:20:51 +0300
Subject: Re: [PATCH] Specify a custom git merge driver for ChangeLog files
References: <20180319183335.GA23327@altlinux.org> <20180320230353.GF6269@wildebeest.org>

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.

-- 
ldv

Attachment: signature.asc
Description: PGP signature

Follow-Ups:
- Re: [PATCH] Specify a custom git merge driver for ChangeLog files
  - From: Dmitry V. Levin
- Re: [PATCH] Specify a custom git merge driver for ChangeLog files
  - From: Mark Wielaard

References:
- [PATCH] Specify a custom git merge driver for ChangeLog files
  - From: Dmitry V. Levin
- Re: [PATCH] Specify a custom git merge driver for ChangeLog files
  - From: Mark Wielaard

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]