git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
* [PATCH] git-rebase.txt: fix description list separator
@ 2020-07-09 18:24 Martin Ågren
  2020-07-09 18:36 ` Junio C Hamano
  0 siblings, 1 reply; 2+ messages in thread
From: Martin Ågren @ 2020-07-09 18:24 UTC (permalink / raw)
  To: git; +Cc: Elijah Newren

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


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] git-rebase.txt: fix description list separator
  2020-07-09 18:24 [PATCH] git-rebase.txt: fix description list separator Martin Ågren
@ 2020-07-09 18:36 ` Junio C Hamano
  0 siblings, 0 replies; 2+ messages in thread
From: Junio C Hamano @ 2020-07-09 18:36 UTC (permalink / raw)
  To: Martin Ågren; +Cc: git, Elijah Newren

Martin Ågren <martin.agren@gmail.com> writes:

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

Obviously correct.  Thanks.

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

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2020-07-09 18:36 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-09 18:24 [PATCH] git-rebase.txt: fix description list separator Martin Ågren
2020-07-09 18:36 ` Junio C Hamano

Code repositories for project(s) associated with this inbox:

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).