diff options
| author | Meng-Sung Wu <mengsungwu@fortunewhite.org> | 2018-06-14 09:33:34 +0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-06-14 09:15:55 -0700 |
| commit | 28cb06020bc86eea46288c29673ac108c3944089 (patch) | |
| tree | d046239310361309003857b37aa80de928211686 /Documentation/git-merge.txt | |
| parent | 1fdbfc443e9ef702df9a305231e15f020920c87a (diff) | |
| download | git-28cb06020bc86eea46288c29673ac108c3944089.tar.gz | |
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>
Diffstat (limited to 'Documentation/git-merge.txt')
| -rw-r--r-- | Documentation/git-merge.txt | 2 |
1 files changed, 1 insertions, 1 deletions
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 |