From: Sylvain Rabot <sylvain@abstraction.fr>
To: Junio C Hamano <gitster@pobox.com>
Cc: Sylvain Rabot <srabot@steek.com>,
git@vger.kernel.org, David Aguilar <davvid@gmail.com>
Subject: Re: [PATCH] documentation: git-mergetool updated to warn against builtin tools invocations
Date: Thu, 3 Jun 2010 12:55:52 +0200 [thread overview]
Message-ID: <AANLkTikPHdRWsHUI-YwEkECtIbj425hKxzy8_JrA4_ny@mail.gmail.com> (raw)
In-Reply-To: <7vbpbt9f9j.fsf@alter.siamese.dyndns.org>
On Thu, Jun 3, 2010 at 01:38, Junio C Hamano <gitster@pobox.com> wrote:
> Sylvain Rabot <srabot@steek.com> writes:
>
>> +Be aware that 'git mergetool' has some predefined invocation commands builtin
>> +for known diff tools like meld, diffuse, p4merge ... etc. It means that if
>> +you set the merge.tool configuration to one of these tools, the
>> +mergetool.<tool>.* configurations will not be taken care of. If you
>> +really want to customize the invocation of one of these tools,
>> +set `merge.tool` to "custom" or whatever you want and `mergetool.custom.cmd`
>> +to "/usr/bin/<tool> $LOCAL $MERGED $REMOTE"
>
> Two half-points and three points (that makes them four in total ;-):
>
> o If I read the above without "It means that", it still makes sense;
Ok
>
> o "If you really" can go without "really";
Ok
>
> * I had to read "will not be taken care of" twice; "are ignored" is
> probably easier to understand;
Ok
>
> * The description and the example makes it sound as if the command line
> has to have these three tokens in the given order, but the whole point
> of this mechanism is that you can launch whatever external command with
> a custom command line, so "and `mergetool.custom.cmd` to a command line
> to invoke the command. $LOCAL $MERGED and $REMOTE on this command line
> are substituted by ...." may be more reader-friendly.
Ok
>
> * As a documentation update it is perfectly fine to describe this glitch,
> but I wonder if we might want to lift this restriction (read: consider
> this as a bug and fix it).
I agree, I wil take a look, I'm not a sh expert but I can try.
If I succeed I will send you a patch, otherwise I will send you a
corrected version of this patch.
>
>> ++
>> +-------------
>> +[merge]
>> + tool = diffuse-custom
>> +[mergetool "diffuse-custom"]
>> + cmd = diffuse $LOCAL $MERGED $REMOTE
>> +-------------
>> ++
>
> Thanks.
>
--
Sylvain
next prev parent reply other threads:[~2010-06-03 10:56 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-02 17:57 [PATCH] documentation: git-mergetool updated to warn against builtin tools invocations Sylvain Rabot
2010-06-02 23:38 ` Junio C Hamano
2010-06-03 7:45 ` Michael J Gruber
2010-06-03 10:55 ` Sylvain Rabot [this message]
2010-06-04 21:29 ` Sylvain Rabot
2010-06-07 12:50 ` Ramkumar Ramachandra
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=AANLkTikPHdRWsHUI-YwEkECtIbj425hKxzy8_JrA4_ny@mail.gmail.com \
--to=sylvain@abstraction.fr \
--cc=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=srabot@steek.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 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).