Skip to content

Commit 28cb060

Browse files
Meng-Sung Wugitster
authored andcommitted
doc: update the order of the syntax git merge --continue
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 1fdbfc4 commit 28cb060

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Documentation/git-merge.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ reconstruct the original (pre-merge) changes. Therefore:
5757
discouraged: while possible, it may leave you in a state that is hard to
5858
back out of in the case of a conflict.
5959

60-
The fourth syntax ("`git merge --continue`") can only be run after the
60+
The third syntax ("`git merge --continue`") can only be run after the
6161
merge has resulted in conflicts.
6262

6363
OPTIONS

0 commit comments

Comments
 (0)