From: Martin Ågren <martin.agren@gmail.com>
Date: Thu, 9 Jul 2020 18:24:38 +0000 (+0200)
Subject: git-rebase.txt: fix description list separator
X-Git-Tag: v2.28.0-rc0~2^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=81de0c01cf72ae5dfdee29b580d8a93f1d4f6d69;p=thirdparty%2Fgit.git

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>
---

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.