All of lore.kernel.org
 help / color / mirror / Atom feed
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: Thu, 13 Nov 2008 12:28:44 +0000	[thread overview]
Message-ID: <20081113122844.GA26842@hashpling.org> (raw)
In-Reply-To: <4902F0C2.2070709@gmail.com>

On Sat, Oct 25, 2008 at 11:11:14AM +0100, William Pursell wrote:
>
> My thinking is that when using an interactive tool
> like vimdiff, the user is probably not going to
> care as much about being prompted, or may prefer
> to have the prompt in that situation.  However,
> if they've written a script to do the merge
> non-interactively, then the prompt is undesirable.
>
> So a person might want to be prompted with
> git mergetool -t vimdiff, and prefer no prompt
> with git mergetool -t my-script.  Being able
> to configure the behavior on a per-tool
> basis would allow that.

I can see your point, although personally I feel that if you've gone
to the trouble of writing a special script, the extra typing of an
extra long option (if you prefer prompting normally) is not that big
compared with the hassle of maintaining per-tool config settings if
you like to regularly swap between merge tools.

Both scenarios are probably not too common so I wouldn't object
strongly to either. (But per tool configs is more dev work!)

-- 
Charles Bailey
http://ccgi.hashpling.plus.com/blog/

      reply	other threads:[~2008-11-13 12:30 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
2008-10-25 10:11                 ` William Pursell
2008-11-13 12:28                   ` Charles Bailey [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=20081113122844.GA26842@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 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.