From: Matthieu Moy <Matthieu.Moy@imag.fr>
To: Gregory Jefferis <jefferis@gmail.com>
Cc: Johannes Sixt <j.sixt@viscovery.net>,
"git\@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: Choosing a mergetool according to file type
Date: Fri, 26 Jun 2009 14:04:59 +0200 [thread overview]
Message-ID: <vpqd48rw68k.fsf@bauges.imag.fr> (raw)
In-Reply-To: <C66A69E6.205F2%jefferis@gmail.com> (Gregory Jefferis's message of "Fri\, 26 Jun 2009 12\:04\:54 +0100")
Gregory Jefferis <jefferis@gmail.com> writes:
> Hi Johannes,
>
> On 2009-06-26 11:43, "Johannes Sixt" <j.sixt@viscovery.net> wrote:
>
>> I don't think that you can choose the merge tool by setting attributes.
>
> OK, that was my impression, but I wanted to check.
Never used it, but man gitattributes says
Performing a three-way merge
merge
[...]
String
3-way merge is performed using the specified custom merge driver. The built-in 3-way merge driver can be explicitly specified by asking
for "text" driver; the built-in "take the current branch" driver can be requested with "binary".
[...]
Defining a custom merge driver
Is it not what you're looking for?
--
Matthieu
next prev parent reply other threads:[~2009-06-26 12:07 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <4A44A66B.10906@viscovery.net>
2009-06-26 11:04 ` Choosing a mergetool according to file type Gregory Jefferis
2009-06-26 11:29 ` Johannes Sixt
2009-06-26 12:04 ` Matthieu Moy [this message]
2009-06-26 13:27 ` Gregory Jefferis
2009-06-26 13:51 ` Matthieu Moy
2009-06-26 16:57 ` Junio C Hamano
2009-06-26 17:43 ` Gregory Jefferis
2009-06-26 17:03 ` Gregory Jefferis
2009-06-26 10:28 Gregory Jefferis
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=vpqd48rw68k.fsf@bauges.imag.fr \
--to=matthieu.moy@imag.fr \
--cc=git@vger.kernel.org \
--cc=j.sixt@viscovery.net \
--cc=jefferis@gmail.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.