Skip to content

Commit 81de0c0

Browse files
Martin Ågrengitster
authored andcommitted
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 52eb738 ("rebase: add an --am option", 2020-02-15) and survived the rename in 10cdb9f ("rebase: rename the two primary rebase backends", 2020-02-15). Signed-off-by: Martin Ågren <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent af6b65d commit 81de0c0

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Documentation/git-rebase.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ See also INCOMPATIBLE OPTIONS below.
258258
original branch. The index and working tree are also left
259259
unchanged as a result.
260260

261-
--apply:
261+
--apply::
262262
Use applying strategies to rebase (calling `git-am`
263263
internally). This option may become a no-op in the future
264264
once the merge backend handles everything the apply one does.

0 commit comments

Comments
 (0)