From: Chris Packham <judge.packham@gmail.com>
To: Markus Hitter <mah@jump-ing.de>
Cc: GIT <git@vger.kernel.org>, Jeff King <peff@peff.net>,
Jacob Keller <jacob.keller@gmail.com>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [RFC/PATCH] merge: Add '--continue' option as a synonym for 'git commit'
Date: Tue, 13 Dec 2016 21:33:23 +1300 [thread overview]
Message-ID: <CAFOYHZCEOXxFCih9E00kf1A7Y_QKe2GCuCB6w8_DJVRevNN9CQ@mail.gmail.com> (raw)
In-Reply-To: <b814932a-b395-2b27-979f-cd170ba363ee@jump-ing.de>
On Mon, Dec 12, 2016 at 10:02 PM, Markus Hitter <mah@jump-ing.de> wrote:
> Am 12.12.2016 um 09:34 schrieb Chris Packham:
>> Teach 'git merge' the --continue option which allows 'continuing' a
>> merge by completing it. The traditional way of completing a merge after
>> resolving conflicts is to use 'git commit'. Now with commands like 'git
>> rebase' and 'git cherry-pick' having a '--continue' option adding such
>> an option to 'git merge' presents a consistent UI.
>
> Like.
>
> While Junio is entirely right that this is redundant, the inner workings of Git are just voodoo for a (guessed) 95% of users out there, so a consistent UI is important.
>
>> DESCRIPTION
>> -----------
>> @@ -61,6 +62,9 @@ reconstruct the original (pre-merge) changes. Therefore:
>> discouraged: while possible, it may leave you in a state that is hard to
>> back out of in the case of a conflict.
>>
>> +The fourth syntax ("`git merge --continue`") can only be run after the
>> +merge has resulted in conflicts. 'git merge --continue' will take the
>> +currently staged changes and complete the merge.
>
> I think this should mention the equivalence to 'git commit'.
>
It is mentioned in the OPTIONS section where the --continue option is
documented. I could move it here but the OPTIONS section is where the
--abort synonym also has a reference to git reset --merge.
>
> Markus
>
> --
> - - - - - - - - - - - - - - - - - - -
> Dipl. Ing. (FH) Markus Hitter
> http://www.jump-ing.de/
next prev parent reply other threads:[~2016-12-13 8:33 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 [this message]
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=CAFOYHZCEOXxFCih9E00kf1A7Y_QKe2GCuCB6w8_DJVRevNN9CQ@mail.gmail.com \
--to=judge.packham@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jacob.keller@gmail.com \
--cc=mah@jump-ing.de \
--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).