git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff King <peff@peff.net>
To: Charles Bailey <charles@hashpling.org>
Cc: git@vger.kernel.org, William Pursell <bill.pursell@gmail.com>,
	Junio C Hamano <gitster@pobox.com>, Theodore Ts'o <tytso@mit.edu>
Subject: Re: [PATCH 3/3] Add -k/--keep-going option to mergetool
Date: Tue, 21 Oct 2008 07:12:02 -0400	[thread overview]
Message-ID: <20081021111201.GA17363@coredump.intra.peff.net> (raw)
In-Reply-To: <1224583999-26279-3-git-send-email-charles@hashpling.org>

On Tue, Oct 21, 2008 at 11:13:19AM +0100, Charles Bailey wrote:

> This option stops git mergetool from aborting at the first failed merge.
> This allows some additional use patterns. Merge conflicts can now be
> previewed one at time and merges can also be skipped so that they can be
> performed in a later pass.

All 3 patches look good to me, and match what I expected from our
earlier discussion. But I am not too familiar with mergetool, so take my
approval with a grain of salt. :)

-Peff

  reply	other threads:[~2008-10-21 11:13 UTC|newest]

Thread overview: 23+ 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 [this message]
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
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

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=20081021111201.GA17363@coredump.intra.peff.net \
    --to=peff@peff.net \
    --cc=bill.pursell@gmail.com \
    --cc=charles@hashpling.org \
    --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).