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

Merge branch 'mw/doc-merge-enumfix' 

Fix old merge glitch in Documentation during v2.13-rc0 era.

* mw/doc-merge-enumfix:
  doc: update the order of the syntax `git merge --continue`
maint
Junio C Hamano 2018-06-18 10:18:45 -07:00
parent f72432d64e 28cb06020b
commit 23fc55a90c
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