mirror of
https://github.com/git/git
synced 2024-10-29 17:08:46 +00:00
git-rebase.txt: fix description list separator
We don't give a "::" for the list separator, but just a single ":". This ends up rendering literally, "--apply: Use applying strategies ...". As a follow-on error, the list continuation, "+", also ends up rendering literally (because we don't have a list). This was introduced in52eb738d6b
("rebase: add an --am option", 2020-02-15) and survived the rename in10cdb9f38a
("rebase: rename the two primary rebase backends", 2020-02-15). Signed-off-by: Martin Ågren <martin.agren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
af6b65d45e
commit
81de0c01cf
1 changed files with 1 additions and 1 deletions
|
@ -258,7 +258,7 @@ See also INCOMPATIBLE OPTIONS below.
|
||||||
original branch. The index and working tree are also left
|
original branch. The index and working tree are also left
|
||||||
unchanged as a result.
|
unchanged as a result.
|
||||||
|
|
||||||
--apply:
|
--apply::
|
||||||
Use applying strategies to rebase (calling `git-am`
|
Use applying strategies to rebase (calling `git-am`
|
||||||
internally). This option may become a no-op in the future
|
internally). This option may become a no-op in the future
|
||||||
once the merge backend handles everything the apply one does.
|
once the merge backend handles everything the apply one does.
|
||||||
|
|
Loading…
Reference in a new issue