* git mergetool ignores configured command line
@ 2011-10-23 4:43 Alexander Vladimirov
2011-10-23 8:37 ` Andreas Schwab
0 siblings, 1 reply; 4+ messages in thread
From: Alexander Vladimirov @ 2011-10-23 4:43 UTC (permalink / raw)
To: git
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?
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: git mergetool ignores configured command line
2011-10-23 4:43 git mergetool ignores configured command line Alexander Vladimirov
@ 2011-10-23 8:37 ` Andreas Schwab
2011-10-23 9:52 ` Junio C Hamano
0 siblings, 1 reply; 4+ messages in thread
From: Andreas Schwab @ 2011-10-23 8:37 UTC (permalink / raw)
To: Alexander Vladimirov; +Cc: git
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."
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: git mergetool ignores configured command line
2011-10-23 8:37 ` Andreas Schwab
@ 2011-10-23 9:52 ` Junio C Hamano
2011-10-23 10:35 ` David Aguilar
0 siblings, 1 reply; 4+ messages in thread
From: Junio C Hamano @ 2011-10-23 9:52 UTC (permalink / raw)
To: Andreas Schwab; +Cc: Alexander Vladimirov, git
Andreas Schwab <schwab@linux-m68k.org> writes:
> diffuse is already a predefined merge tool, so mergetool.diffuse.cmd is
> ignored. Try using a different name.
I wonder if we can improve this, though.
It is nice that we give canned definition of argument order to so many
obscure tools, but instead of ignoring mergetool.<tool>.cmd when the user
told us to use <tool>, couldn't we simply ignore what we have internally
as canned definition?
Even if such a change were too intrusive (I didn't check), could we have
a decency to at least warn that we are ignoring the configuration?
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: git mergetool ignores configured command line
2011-10-23 9:52 ` Junio C Hamano
@ 2011-10-23 10:35 ` David Aguilar
0 siblings, 0 replies; 4+ messages in thread
From: David Aguilar @ 2011-10-23 10:35 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Andreas Schwab, Alexander Vladimirov, git
On Sun, Oct 23, 2011 at 02:52:19AM -0700, Junio C Hamano wrote:
> Andreas Schwab <schwab@linux-m68k.org> writes:
>
> > diffuse is already a predefined merge tool, so mergetool.diffuse.cmd is
> > ignored. Try using a different name.
>
> I wonder if we can improve this, though.
>
> It is nice that we give canned definition of argument order to so many
> obscure tools, but instead of ignoring mergetool.<tool>.cmd when the user
> told us to use <tool>, couldn't we simply ignore what we have internally
> as canned definition?
>
> Even if such a change were too intrusive (I didn't check), could we have
> a decency to at least warn that we are ignoring the configuration?
I agree. Ideally, we should honor their configuration.
I'll see if doing so is not too intrusive.
--
David
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-10-23 10:35 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-10-23 4:43 git mergetool ignores configured command line Alexander Vladimirov
2011-10-23 8:37 ` Andreas Schwab
2011-10-23 9:52 ` Junio C Hamano
2011-10-23 10:35 ` David Aguilar
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).