kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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 2018-06-14 09:33:34 +08:00 committed by Junio C Hamano
parent 1fdbfc443e
commit 28cb06020b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/git-merge.txt
View File

@ -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