mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Documentation/git-merge.txt: fix reference to synopsis
437591a9d7
combined the synopsis of "The second syntax" (meaning `git
merge --abort`) and "The third syntax" (for `git merge --continue`) into
this single line:
git merge (--continue | --abort | --quit)
but it was still referred to when describing the preconditions that have
to be fulfilled to run the respective actions. In other words:
References by number are no longer valid after a merge of some of the
synopses.
Also the previous version of the documentation did not acknowledge that
`--no-commit` would result in the precondition being fulfilled (thanks
to Elijah Newren and Junio C Hamano for pointing that out).
This change also groups `--abort` and `--continue` together when
explaining the prerequisites in order to avoid duplication.
Helped-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Michael Lohmann <mi.al.lohmann@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
564d0252ca
commit
dc18ead555
|
@ -46,21 +46,21 @@ a log message from the user describing the changes. Before the operation,
|
||||||
D---E---F---G---H master
|
D---E---F---G---H master
|
||||||
------------
|
------------
|
||||||
|
|
||||||
The second syntax ("`git merge --abort`") can only be run after the
|
A merge stops if there's a conflict that cannot be resolved
|
||||||
merge has resulted in conflicts. 'git merge --abort' will abort the
|
automatically or if `--no-commit` was provided when initiating the
|
||||||
merge process and try to reconstruct the pre-merge state. However,
|
merge. At that point you can run `git merge --abort` or `git merge
|
||||||
if there were uncommitted changes when the merge started (and
|
--continue`.
|
||||||
especially if those changes were further modified after the merge
|
|
||||||
was started), 'git merge --abort' will in some cases be unable to
|
`git merge --abort` will abort the merge process and try to reconstruct
|
||||||
reconstruct the original (pre-merge) changes. Therefore:
|
the pre-merge state. However, if there were uncommitted changes when the
|
||||||
|
merge started (and especially if those changes were further modified
|
||||||
|
after the merge was started), `git merge --abort` will in some cases be
|
||||||
|
unable to reconstruct the original (pre-merge) changes. Therefore:
|
||||||
|
|
||||||
*Warning*: Running 'git merge' with non-trivial uncommitted changes is
|
*Warning*: Running 'git merge' with non-trivial uncommitted changes is
|
||||||
discouraged: while possible, it may leave you in a state that is hard to
|
discouraged: while possible, it may leave you in a state that is hard to
|
||||||
back out of in the case of a conflict.
|
back out of in the case of a conflict.
|
||||||
|
|
||||||
The third syntax ("`git merge --continue`") can only be run after the
|
|
||||||
merge has resulted in conflicts.
|
|
||||||
|
|
||||||
OPTIONS
|
OPTIONS
|
||||||
-------
|
-------
|
||||||
:git-merge: 1
|
:git-merge: 1
|
||||||
|
|
Loading…
Reference in a new issue