From: Jeff King <peff@peff.net>
To: Alec Clews <alecclews@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: How to install and use a custom merge driver
Date: Thu, 29 Jan 2009 00:03:48 -0500 [thread overview]
Message-ID: <20090129050348.GA31202@coredump.intra.peff.net> (raw)
In-Reply-To: <loom.20090129T044425-689@post.gmane.org>
On Thu, Jan 29, 2009 at 04:47:19AM +0000, Alec Clews wrote:
> It appears that TAB is not supported as white space in either attributes or
> config files? I removed all the tabs and it works as described on the box
That's odd. It should be fine. And if I repeat the test I posted with:
printf '*\tmerge=overwrite\n' >.git/info/attributes
(printf '[merge "overwrite"]\n'
printf '\tname = overwrite using cp\n'
printf '\tdriver = cp %%B %%A\n'
) >>.git/config
it works as before.
What git version are you using? Can you post a shell snippet that breaks
reliably?
-Peff
next prev parent reply other threads:[~2009-01-29 5:05 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 [this message]
2009-01-29 7:00 ` Alec Clews
2009-01-29 7:11 ` Jeff King
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=20090129050348.GA31202@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=alecclews@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).