From: Jacob Keller <jacob.keller@gmail.com>
To: Jeff King <peff@peff.net>, Chris Packham <judge.packham@gmail.com>
Cc: GIT <git@vger.kernel.org>
Subject: Re: Any interest in 'git merge --continue' as a command
Date: Fri, 09 Dec 2016 02:37:42 -0800 [thread overview]
Message-ID: <025427FB-D91F-48B4-B031-5AE1C7BAC779@gmail.com> (raw)
In-Reply-To: <20161209091127.sxxczhfslrqsqs3m@sigill.intra.peff.net>
On December 9, 2016 1:11:27 AM PST, Jeff King <peff@peff.net> wrote:
>On Fri, Dec 09, 2016 at 08:57:58PM +1300, Chris Packham wrote:
>
>> I hit this at $dayjob recently.
>>
>> A developer had got themselves into a confused state when needing to
>> resolve a merge conflict.
>>
>> They knew about git rebase --continue (and git am and git
>cherry-pick)
>> but they were unsure how to "continue" a merge (it didn't help that
>> the advice saying to use 'git commit' was scrolling off the top of
>the
>> terminal). I know that using 'git commit' has been the standard way
>to
>> complete a merge but given other commands have a --continue should
>> merge have it as well?
>
>It seems like that would be in line with 35d2fffdb (Provide 'git merge
>--abort' as a synonym to 'git reset --merge', 2010-11-09), whose stated
>goal was providing consistency with other multi-command operations.
>
>I assume it would _just_ run a vanilla "git commit", and not try to do
>any trickery with updating the index (which could be disastrous).
>
>-Peff
This makes sense to me.
Thanks,
Jake
next prev parent reply other threads:[~2016-12-09 10:37 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 [this message]
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
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=025427FB-D91F-48B4-B031-5AE1C7BAC779@gmail.com \
--to=jacob.keller@gmail.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.
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).