From: John Keeping <john@keeping.me.uk>
To: Junio C Hamano <gitster@pobox.com>
Cc: David Aguilar <davvid@gmail.com>,
git@vger.kernel.org, Charles Bailey <charles@hashpling.org>,
Theodore Ts'o <tytso@mit.edu>
Subject: Re: [RFC PATCH 2/3] mergetools/kdiff3: allow opting-out of auto-merges
Date: Thu, 9 May 2013 18:23:34 +0100 [thread overview]
Message-ID: <20130509172334.GK25912@serenity.lan> (raw)
In-Reply-To: <7vli7ob0c4.fsf@alter.siamese.dyndns.org>
On Thu, May 09, 2013 at 09:10:51AM -0700, Junio C Hamano wrote:
> David Aguilar <davvid@gmail.com> writes:
>
> > Marked "RFC" because I am kinda against adding more configuration
> > variables.
>
> Just like "git merge" has -X<option> escape hatch to allow us to
> pass backend-specific options, perhaps you can add a mechanism to
> "git mergetool" to let the user pass --no-auto from the command
> line?
We already have "mergetool.<tool>.cmd" which allows a completely custom
command line to be specified. IIUC this can be used to override the
built-in command for tool names that already exist.
I'm not sure an extra -X<option> buys us much on top of this, but
perhaps it would be useful for one-off usage.
next prev parent reply other threads:[~2013-05-09 17:23 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-09 9:13 [PATCH 1/3] mergetools/kdiff3: do not use --auto when diffing David Aguilar
2013-05-09 9:13 ` [RFC PATCH 2/3] mergetools/kdiff3: allow opting-out of auto-merges David Aguilar
2013-05-09 9:13 ` [RFC PATCH 3/3] Makefile: avoid deprecation warnings on OS X 10.8 David Aguilar
2013-05-09 15:14 ` John Keeping
2013-05-09 23:21 ` David Aguilar
2013-05-09 16:10 ` [RFC PATCH 2/3] mergetools/kdiff3: allow opting-out of auto-merges Junio C Hamano
2013-05-09 17:23 ` John Keeping [this message]
2013-05-09 19:15 ` Junio C Hamano
2013-05-09 22:17 ` David Aguilar
2013-05-10 5:41 ` Charles Bailey
2013-05-10 18:40 ` 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=20130509172334.GK25912@serenity.lan \
--to=john@keeping.me.uk \
--cc=charles@hashpling.org \
--cc=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=tytso@mit.edu \
/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).