From: Meng-Sung Wu Date: Thu, 14 Jun 2018 01:33:34 +0000 (+0800) Subject: doc: update the order of the syntax `git merge --continue` X-Git-Tag: v2.18.0~15^2 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/28cb06020bc86eea46288c29673ac108c3944089 doc: update the order of the syntax `git merge --continue` The syntax "git merge HEAD " has been removed. The order of the syntax should also be updated. Signed-off-by: Meng-Sung Wu Signed-off-by: Junio C Hamano --- diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index 04fdd8cf08..4a565a15e4 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