From: Junio C Hamano <gitster@pobox.com>
To: Meng-Sung Wu <mengsungwu@fortunewhite.org>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] doc: update the order of the syntax `git merge --continue`
Date: Wed, 13 Jun 2018 11:21:58 -0700 [thread overview]
Message-ID: <xmqq36xq7dix.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20180613035702.15957-1-mengsungwu@fortunewhite.org> (Meng-Sung Wu's message of "Wed, 13 Jun 2018 11:57:02 +0800")
Meng-Sung Wu <mengsungwu@fortunewhite.org> writes:
> The syntax "git merge <message> HEAD <commit>" has been removed. The
> order of the syntax should also be updated.
> ---
> Documentation/git-merge.txt | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
An obviously good change. Could you please sign-off your patch?
cf. https://git.github.io/htmldocs/SubmittingPatches.html#sign-off
> diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
> index d5dfd8430..6a5c00e2c 100644
> --- a/Documentation/git-merge.txt
> +++ b/Documentation/git-merge.txt
> @@ -57,7 +57,7 @@ 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
> +The third syntax ("`git merge --continue`") can only be run after the
> merge has resulted in conflicts.
>
> OPTIONS
next prev parent reply other threads:[~2018-06-13 18:22 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-13 3:57 [PATCH] doc: update the order of the syntax `git merge --continue` Meng-Sung Wu
2018-06-13 18:21 ` Junio C Hamano [this message]
2018-06-14 1:33 ` [PATCH v2] " Meng-Sung Wu
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=xmqq36xq7dix.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=mengsungwu@fortunewhite.org \
/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).