[PATCH] Documentation/git-merge.txt: fix reference to synopsys
- From
Michael Lohmann <mial.lohmann@gmail.com>
- Date
- Dec 20, 2023, 07:05 UTC
- Message-ID
- <20231220070528.8049-1-mi.al.lohmann@gmail.com>
437591a9d738 changed the synopsys from two separate lines for `--abort` and `--continue` to a single line (and it also simultaneously added `--quit`). That way the "enumeration" of the syntax for `--continue` is no longer valid. Since `--quit` is now also part of the same syntax line, a general statement cannot be made any more. Instead of trying to enumerate the synopsys, be explicit in the limitations of when respective actions are valid.
This change also groups `--abort` and `--continue` together when explaining the circumstances under which they can be run in order to avoid duplication.
Signed-off-by: Michael Lohmann <mi.al.lohmann@gmail.com> --- Documentation/git-merge.txt | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index e8ab340319..d8863cc943 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -46,21 +46,20 @@ a log message from the user describing the changes. Before the operation, D---E---F---G---H master ------------ -The second syntax ("`git merge --abort`") can only be run after the -merge has resulted in conflicts. 'git merge --abort' will abort the -merge process and try to reconstruct 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: +It is possible that a merge failure will prevent this process from being +completely automatic. "`git merge --continue`" and "`git merge --abort`" +can only be run after the merge has resulted in conflicts. + +'git merge --abort' will abort the merge process and try to reconstruct +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 discouraged: while possible, it may leave you in a state that is hard to 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 ------- :git-merge: 1
-- 2.39.3 (Apple Git-145)