diff options
| author | Martin Ågren <martin.agren@gmail.com> | 2020-07-09 20:24:38 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-07-09 20:35:57 +0200 |
| commit | 81de0c01cf72ae5dfdee29b580d8a93f1d4f6d69 (patch) | |
| tree | 31d5e1ac32135087e617621561e1eb1502aa6337 /Documentation/git-rebase.txt | |
| parent | Git 2.26.2 (diff) | |
| download | git-81de0c01cf72ae5dfdee29b580d8a93f1d4f6d69.tar.xz git-81de0c01cf72ae5dfdee29b580d8a93f1d4f6d69.zip | |
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>
Diffstat (limited to 'Documentation/git-rebase.txt')
| -rw-r--r-- | Documentation/git-rebase.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index f7a6033607..9acea055d7 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -258,7 +258,7 @@ See also INCOMPATIBLE OPTIONS below. original branch. The index and working tree are also left unchanged as a result. ---apply: +--apply:: Use applying strategies to rebase (calling `git-am` internally). This option may become a no-op in the future once the merge backend handles everything the apply one does. |