From: David Aguilar <davvid@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Andreas Schwab <schwab@linux-m68k.org>,
Alexander Vladimirov <alexander.idkfa.vladimirov@gmail.com>,
git@vger.kernel.org
Subject: Re: git mergetool ignores configured command line
Date: Sun, 23 Oct 2011 03:35:01 -0700 [thread overview]
Message-ID: <20111023103459.GA29816@gmail.com> (raw)
In-Reply-To: <7vaa8s592k.fsf@alter.siamese.dyndns.org>
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
prev parent reply other threads:[~2011-10-23 10:35 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
2011-10-23 9:52 ` Junio C Hamano
2011-10-23 10:35 ` David Aguilar [this message]
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=20111023103459.GA29816@gmail.com \
--to=davvid@gmail.com \
--cc=alexander.idkfa.vladimirov@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=schwab@linux-m68k.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.