From: Charles Bailey <charles@hashpling.org>
To: Theodore Tso <tytso@mit.edu>
Cc: Junio C Hamano <gitster@pobox.com>,
git@vger.kernel.org, Jeff King <peff@peff.net>,
Andreas Ericsson <ae@op5.se>,
William Pursell <bill.pursell@gmail.com>
Subject: Re: [PATCH 3/3] Add -k/--keep-going option to mergetool
Date: Mon, 24 Nov 2008 22:03:11 +0000 [thread overview]
Message-ID: <20081124220311.GB5293@hashpling.org> (raw)
In-Reply-To: <20081115155603.GD22948@mit.edu>
On Sat, Nov 15, 2008 at 10:56:03AM -0500, Theodore Tso wrote:
> Instead of making this be a command-line and configuration option,
> maybe it would be better to prompt the user after an aborted merge,
> and give the user the opportunity to continue or abort? i.e., instead
> of just saying "merge of foo.c failed" and then exiting, to ask the
> user instad something like, "Merge of foo.c failed; continue
> attempting to merge the rest of the files? <y>"
>
> I suspect this might be more friendly than Yet Another command-line
> option and configuration parameter. What do you think?
>
> - Ted
This sounds like a really good alternative interface option. The next
time I have a moment (could be a while!) I'll try and make a patch
based on this idea.
Charles.
next prev parent reply other threads:[~2008-11-24 22:04 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-11-13 12:41 git mergetool enhancements Charles Bailey
2008-11-13 12:41 ` [PATCH 1/3] Fix some tab/space inconsistencies in git-mergetool.sh Charles Bailey
2008-11-13 12:41 ` [PATCH 2/3] Add -y/--no-prompt option to mergetool Charles Bailey
2008-11-13 12:41 ` [PATCH 3/3] Add -k/--keep-going " Charles Bailey
2008-11-14 6:47 ` Jeff King
2008-11-14 13:25 ` Charles Bailey
2008-11-14 16:21 ` Jeff King
2008-11-15 16:12 ` Theodore Tso
2008-11-15 5:35 ` Junio C Hamano
2008-11-15 5:38 ` Jeff King
2008-11-24 21:59 ` Charles Bailey
2008-11-15 15:56 ` Theodore Tso
2008-11-24 22:03 ` Charles Bailey [this message]
2008-11-15 15:50 ` [PATCH 2/3] Add -y/--no-prompt " Theodore Tso
-- strict thread matches above, loose matches on Subject: below --
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
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=20081124220311.GB5293@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.