{"thread":{"id":"53825","subject":"[PATCH] git-rebase.txt: fix description list separator","startedAt":"2020-07-09T18:24:56Z","lastAt":"2020-07-09T18:36:20Z","messageCount":2,"participants":["Martin Ågren","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"401259","messageId":"20200709182438.17355-1-martin.agren@gmail.com","threadId":"53825","inReplyTo":null,"subject":"[PATCH] git-rebase.txt: fix description list separator","fromName":"Martin Ågren","fromEmail":"martin.agren@gmail.com","sentAt":"2020-07-09T18:24:38Z","receivedAt":"2020-07-09T18:24:56Z","isPatch":true,"sender":{"key":"martin.agren@gmail.com","avatar":null},"body":"We don't give a \"::\" for the list separator, but just a single \":\". This\nends up rendering literally, \"--apply: Use applying strategies ...\". As\na follow-on error, the list continuation, \"+\", also ends up rendering\nliterally (because we don't have a list).\n\nThis was introduced in 52eb738d6b (\"rebase: add an --am option\",\n2020-02-15) and survived the rename in 10cdb9f38a (\"rebase: rename the\ntwo primary rebase backends\", 2020-02-15).\n\nSigned-off-by: Martin Ågren <martin.agren@gmail.com>\n---\n See, e.g., https://git-scm.com/docs/git-rebase/en#Documentation/git-rebase.txt---quit\n\n Documentation/git-rebase.txt | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt\nindex f7a6033607..9acea055d7 100644\n--- a/Documentation/git-rebase.txt\n+++ b/Documentation/git-rebase.txt\n@@ -258,7 +258,7 @@ See also INCOMPATIBLE OPTIONS below.\n \toriginal branch. The index and working tree are also left\n \tunchanged as a result.\n \n---apply:\n+--apply::\n \tUse applying strategies to rebase (calling `git-am`\n \tinternally).  This option may become a no-op in the future\n \tonce the merge backend handles everything the apply one does.\n-- \n2.27.0\n\n"},{"id":"401260","messageId":"xmqqwo3cwn6q.fsf@gitster.c.googlers.com","threadId":"53825","inReplyTo":"20200709182438.17355-1-martin.agren@gmail.com","subject":"Re: [PATCH] git-rebase.txt: fix description list separator","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2020-07-09T18:36:13Z","receivedAt":"2020-07-09T18:36:20Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Martin Ågren <martin.agren@gmail.com> writes:\n\n> We don't give a \"::\" for the list separator, but just a single \":\". This\n> ends up rendering literally, \"--apply: Use applying strategies ...\". As\n> a follow-on error, the list continuation, \"+\", also ends up rendering\n> literally (because we don't have a list).\n>\n> This was introduced in 52eb738d6b (\"rebase: add an --am option\",\n> 2020-02-15) and survived the rename in 10cdb9f38a (\"rebase: rename the\n> two primary rebase backends\", 2020-02-15).\n>\n> Signed-off-by: Martin Ågren <martin.agren@gmail.com>\n> ---\n>  See, e.g., https://git-scm.com/docs/git-rebase/en#Documentation/git-rebase.txt---quit\n>\n>  Documentation/git-rebase.txt | 2 +-\n>  1 file changed, 1 insertion(+), 1 deletion(-)\n>\n> diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt\n> index f7a6033607..9acea055d7 100644\n> --- a/Documentation/git-rebase.txt\n> +++ b/Documentation/git-rebase.txt\n> @@ -258,7 +258,7 @@ See also INCOMPATIBLE OPTIONS below.\n>  \toriginal branch. The index and working tree are also left\n>  \tunchanged as a result.\n>  \n> ---apply:\n> +--apply::\n\nObviously correct.  Thanks.\n\n>  \tUse applying strategies to rebase (calling `git-am`\n>  \tinternally).  This option may become a no-op in the future\n>  \tonce the merge backend handles everything the apply one does.\n"}]}