Files
git/Documentation
Michael Lohmann dc18ead555 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>
2023-12-20 13:39:56 -08:00
..
2023-11-20 10:28:15 +09:00
2023-10-30 07:09:55 +09:00
2023-06-12 13:52:51 -07:00
2023-06-12 13:52:51 -07:00
2023-10-09 12:06:24 -07:00
2023-10-09 12:06:29 -07:00
2023-10-09 12:06:29 -07:00
2023-09-02 15:21:44 -07:00
2023-10-09 12:06:29 -07:00
2023-06-12 13:52:51 -07:00
2023-06-12 13:52:51 -07:00
2023-10-23 13:56:37 -07:00
2021-12-10 14:35:03 -08:00
2023-05-16 11:38:14 -07:00
2023-10-09 12:06:24 -07:00
2023-10-09 12:06:29 -07:00
2023-10-05 12:55:38 -07:00
2023-10-09 12:06:29 -07:00
2023-10-09 12:06:29 -07:00
2023-08-28 09:16:06 -07:00
2023-10-09 12:04:21 -07:00