From: Mark Wielaard <mark@klomp.org>
To: elfutils-devel@sourceware.org
Subject: Re: [PATCH] Specify a custom git merge driver for ChangeLog files
Date: Wed, 21 Mar 2018 00:16:00 -0000 [thread overview]
Message-ID: <20180321001632.GG6269@wildebeest.org> (raw)
In-Reply-To: <20180320232051.GA12453@altlinux.org>
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
prev parent reply other threads:[~2018-03-21 0:16 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-19 18:33 Dmitry V. Levin
2018-03-20 23:03 ` Mark Wielaard
2018-03-20 23:20 ` Dmitry V. Levin
2018-03-20 23:42 ` Dmitry V. Levin
2018-03-21 0:16 ` Mark Wielaard [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180321001632.GG6269@wildebeest.org \
--to=mark@klomp.org \
--cc=elfutils-devel@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).