From: Jeff King <peff@peff.net>
To: Chris Packham <judge.packham@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>, GIT <git@vger.kernel.org>
Subject: Re: Any interest in 'git merge --continue' as a command
Date: Sat, 10 Dec 2016 04:00:55 -0500 [thread overview]
Message-ID: <20161210090054.w6qhmszcjkatjhm5@sigill.intra.peff.net> (raw)
In-Reply-To: <CAFOYHZAsU_gNb=_K=iMFKFdt60SJ4Wm=Ag5=XMXuQgxNxCqWLA@mail.gmail.com>
On Sat, Dec 10, 2016 at 09:49:13PM +1300, Chris Packham wrote:
> > There is nothing to "continue" in a stopped merge where Git asked
> > for help from the user, and because of that, I view the final "git
> > commit" as "concluding the merge", not "continuing". "continue"
> > makes quite a lot of sense with rebase and cherry-pick A..B that
> > stopped; it concludes the current step and let it continue to
> > process the remainder. So from that point of view, it somewhat
> > feels strange to call it "merge --continue", but it probably is just
> > me.
>
> Yeah I did think that --continue wasn't quite the right word. git
> merge --conclude would probably be the most accurate.
I'd be against giving it a subtly-different name. It's just going to
frustrate people who cannot remember when to use "--conclude" and when
it is "--continue". The strength of the proposal, IMHO, is that it
abstracts the idea of "go on to the next thing or finish" across many
commands.
-Peff
next prev parent reply other threads:[~2016-12-10 9:01 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 [this message]
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
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161210090054.w6qhmszcjkatjhm5@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=judge.packham@gmail.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).