From: Jeff King <peff@peff.net>
To: Alec Clews <alec.clews@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: How to install and use a custom merge driver
Date: Thu, 29 Jan 2009 02:11:58 -0500 [thread overview]
Message-ID: <20090129071158.GA554@coredump.intra.peff.net> (raw)
In-Reply-To: <49815423.8000902@gmail.com>
On Thu, Jan 29, 2009 at 06:00:51PM +1100, Alec Clews wrote:
> The problem appears to be spaces around '=' in the attributes file. This
> fails for me
> [...]
> echo '* merge = overwrite' >.git/info/attributes
Ah, OK. That isn't supposed to work. The attributes are whitespace
separated, and some don't even have an equals at all (e.g., "merge",
"-merge", and "merge=foo" are all valid). So that parses to "please use
the ordinary text merge driver", and some attributes that nobody uses
called "=" and "overwrite".
-Peff
prev parent reply other threads:[~2009-01-29 7:13 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-28 3:10 How to install and use a custom merge driver Alec Clews
2009-01-28 6:18 ` Jeff King
2009-01-28 23:04 ` Alec Clews
2009-01-28 23:31 ` Alec Clews
2009-01-29 3:25 ` Jeff King
2009-01-29 4:47 ` Alec Clews
2009-01-29 5:03 ` Jeff King
2009-01-29 7:00 ` Alec Clews
2009-01-29 7:11 ` Jeff King [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=20090129071158.GA554@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=alec.clews@gmail.com \
--cc=git@vger.kernel.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 NNTP newsgroup(s).