From: Andreas Schwab <schwab@linux-m68k.org>
To: Alexander Vladimirov <alexander.idkfa.vladimirov@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: git mergetool ignores configured command line
Date: Sun, 23 Oct 2011 10:37:49 +0200 [thread overview]
Message-ID: <m21uu4hzmq.fsf@linux-m68k.org> (raw)
In-Reply-To: <CAARCrw6D7CKy2Jn43zUZ3EefyqdY6Tk4A39ZQ74H6hySA5eCBQ@mail.gmail.com> (Alexander Vladimirov's message of "Sun, 23 Oct 2011 12:43:26 +0800")
Alexander Vladimirov <alexander.idkfa.vladimirov@gmail.com> writes:
> To configure diffuse as merge tool I set mergetool configuration using
> following commands:
>
> git config --global merge.tool diffuse
> git config --global mergetool.diffuse.cmd '/usr/bin/diffuse "$LOCAL"
> "$MERGED" "$REMOTE"'
>
> Then, when I invoke mergetool during merge, I get diffuse with four
> panes open as by default, instead of three specified in command line
> setting.
> Is this an expected behavior, and how can I force mergetool to use
> provided command line?
diffuse is already a predefined merge tool, so mergetool.diffuse.cmd is
ignored. Try using a different name.
Andreas.
--
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."
next prev parent reply other threads:[~2011-10-23 8:37 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-23 4:43 git mergetool ignores configured command line Alexander Vladimirov
2011-10-23 8:37 ` Andreas Schwab [this message]
2011-10-23 9:52 ` Junio C Hamano
2011-10-23 10:35 ` David Aguilar
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=m21uu4hzmq.fsf@linux-m68k.org \
--to=schwab@linux-m68k.org \
--cc=alexander.idkfa.vladimirov@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 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.