Browse Source

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 <mengsungwu@fortunewhite.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Meng-Sung Wu 7 years ago committed by Junio C Hamano
parent
commit
28cb06020b
  1. 2
      Documentation/git-merge.txt

2
Documentation/git-merge.txt

@ -57,7 +57,7 @@ reconstruct the original (pre-merge) changes. Therefore: @@ -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

Loading…
Cancel
Save