| commit | 81de0c01cf72ae5dfdee29b580d8a93f1d4f6d69 | |
| author | Martin Ågren <martin.agren@gmail.com> | |
| Thu, 9 Jul 2020 18:24:38 +0000 (9 20:24 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 9 Jul 2020 18:35:57 +0000 (9 11:35 -0700) | ||
| tree | 31d5e1ac32135087e617621561e1eb1502aa6337 | treesnapshot (tar.gz zip) |
| parent | af6b65d45ef179ed52087e80cb089f6b2349f4ec | commitdiff |
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 in 52eb738d6b ("rebase: add an --am option",
2020-02-15) and survived the rename in 10cdb9f38a ("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>
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 in 52eb738d6b ("rebase: add an --am option",
2020-02-15) and survived the rename in 10cdb9f38a ("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>
| Documentation/git-rebase.txt | diffblobblamehistory |