All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: Chris Packham <judge.packham@gmail.com>, GIT <git@vger.kernel.org>
Subject: Re: Any interest in 'git merge --continue' as a command
Date: Sat, 10 Dec 2016 10:16:02 -0800	[thread overview]
Message-ID: <xmqqoa0jps4d.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20161210085938.rfbkuwpvyhnhuzhn@sigill.intra.peff.net> (Jeff King's message of "Sat, 10 Dec 2016 03:59:39 -0500")

Jeff King <peff@peff.net> writes:

> No, I think your reasoning makes sense. But I also think we've already
> choosen to have "--continue" mean "conclude the current, and continue if
> there is anything left" in other contexts (e.g., a single-item
> cherry-pick). It's more vague, but I think it keeps the user's mental
> model simpler if we provide a standard set of options for multi-step
> commands (e.g., always "--continue/--abort/--skip", though there are
> some like merge that omit "--skip" if it does not make sense).

Yup.  I know you know me well enough to know that I didn't mean to
say "oh this one needs to be called differently" ;-)  I just felt
that "--continue" in that context did not sit well.

      reply	other threads:[~2016-12-10 18:16 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-12-09  7:57 Any interest in 'git merge --continue' as a command Chris Packham
2016-12-09  9:11 ` Jeff King
2016-12-09 10:37   ` Jacob Keller
2016-12-09 19:16   ` Junio C Hamano
2016-12-10  8:49     ` Chris Packham
2016-12-10  9:00       ` Jeff King
2016-12-10 10:58         ` Jacob Keller
2016-12-12  8:34       ` [RFC/PATCH] merge: Add '--continue' option as a synonym for 'git commit' Chris Packham
2016-12-12  9:02         ` Markus Hitter
2016-12-13  8:33           ` Chris Packham
2016-12-12  9:40         ` Jeff King
2016-12-13  8:48         ` [PATCHv2 1/2] " Chris Packham
2016-12-13  8:48           ` [PATCHv2 2/2] completion: add --continue option for merge Chris Packham
2016-12-13 11:59           ` [PATCHv2 1/2] merge: Add '--continue' option as a synonym for 'git commit' Jeff King
2016-12-13 18:02           ` Junio C Hamano
2016-12-14  8:37           ` [PATCHv3 1/3] " Chris Packham
2016-12-14  8:37             ` [PATCH 2/3] completion: add --continue option for merge Chris Packham
2016-12-14  8:37             ` [PATCH 3/3] merge: Ensure '--abort' option takes no arguments Chris Packham
2016-12-14 15:20             ` [PATCHv3 1/3] merge: Add '--continue' option as a synonym for 'git commit' Jeff King
2016-12-14 17:01               ` Junio C Hamano
2016-12-14 18:04             ` Junio C Hamano
2016-12-15  7:29               ` Chris Packham
2016-12-15 17:36                 ` Junio C Hamano
2016-12-15 17:43                   ` Jeff King
2016-12-10  8:59     ` Any interest in 'git merge --continue' as a command Jeff King
2016-12-10 18:16       ` Junio C Hamano [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=xmqqoa0jps4d.fsf@gitster.mtv.corp.google.com \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=judge.packham@gmail.com \
    --cc=peff@peff.net \
    /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.