From: Meng-Sung Wu <mengsungwu@fortunewhite.org>
To: gitster@pobox.com
Cc: git@vger.kernel.org, mengsungwu@fortunewhite.org
Subject: [PATCH v2] doc: update the order of the syntax `git merge --continue`
Date: Thu, 14 Jun 2018 09:33:34 +0800 [thread overview]
Message-ID: <20180614013334.17145-1-mengsungwu@fortunewhite.org> (raw)
In-Reply-To: <xmqq36xq7dix.fsf@gitster-ct.c.googlers.com>
The syntax "git merge <message> HEAD <commit>" has been removed. The
order of the syntax should also be updated.
Signed-off-by: Meng-Sung Wu <mengsungwu@fortunewhite.org>
---
Documentation/git-merge.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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
--
2.15.1 (Apple Git-101)
prev parent reply other threads:[~2018-06-14 1:36 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
2018-06-14 1:33 ` Meng-Sung Wu [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
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=20180614013334.17145-1-mengsungwu@fortunewhite.org \
--to=mengsungwu@fortunewhite.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).