git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH] git-rebase.txt: fix description list separator

From
MÅMartin Ågren <martin.agren@gmail.com>
Date
Jul 9, 2020, 18:24 UTC
Message-ID
<20200709182438.17355-1-martin.agren@gmail.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>
---
 See, e.g., https://git-scm.com/docs/git-rebase/en#Documentation/git-rebase.txt---quit
 Documentation/git-rebase.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
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.
-- 
2.27.0
Next: Junio C Hamano
Message 1 of 2 in “git-rebase.txt: fix description list separator”
  1. git-rebase.txt: fix description list separatorMartin Ågren, Jul 9, 2020
  2. Junio C HamanoJul 9, 2020

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.