From: Charles Bailey <charles@hashpling.org>
To: William Pursell <bill.pursell@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>,
git@vger.kernel.org, Jeff King <peff@peff.net>,
Andreas Ericsson <ae@op5.se>, "Theodore Ts'o" <tytso@mit.edu>
Subject: Re: [PATCH 2/3] Add -n/--no-prompt option to mergetool
Date: Fri, 24 Oct 2008 23:55:39 +0100 [thread overview]
Message-ID: <20081024225539.GA6119@hashpling.org> (raw)
In-Reply-To: <49024CF1.5040406@gmail.com>
On Fri, Oct 24, 2008 at 11:32:17PM +0100, William Pursell wrote:
>
> If the short option is dropped, the config option should
> probably associated with mergetool.<tool>.interactive rather
> than mergetool.interactive. (s/interactive/whatever)
I'm not sure I understand your reasoning. The no-prompt/interactive
option affects the behaviour of the mergetool script independent of
which particular merge tool is being used. Why should the presence or
absence of a short option affect whether the config option is global
or per tool?
--
Charles Bailey
http://ccgi.hashpling.plus.com/blog/
next prev parent reply other threads:[~2008-10-24 22:57 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-21 10:13 [PATCH 1/3] Fix some tab/space inconsistencies in git-mergetool.sh Charles Bailey
2008-10-21 10:13 ` [PATCH 2/3] Add -n/--no-prompt option to mergetool Charles Bailey
2008-10-21 10:13 ` [PATCH 3/3] Add -k/--keep-going " Charles Bailey
2008-10-21 11:12 ` Jeff King
2008-10-21 11:49 ` [PATCH 2/3] Add -n/--no-prompt " Andreas Ericsson
2008-10-21 12:26 ` Charles Bailey
2008-10-22 21:17 ` Charles Bailey
2008-10-22 23:21 ` Junio C Hamano
2008-10-23 6:44 ` Charles Bailey
2008-10-24 22:32 ` William Pursell
2008-10-24 22:55 ` Charles Bailey [this message]
2008-10-25 10:11 ` William Pursell
2008-11-13 12:28 ` Charles Bailey
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=20081024225539.GA6119@hashpling.org \
--to=charles@hashpling.org \
--cc=ae@op5.se \
--cc=bill.pursell@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--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).