From: Junio C Hamano <gitster@pobox.com>
To: "Martin Ågren" <martin.agren@gmail.com>
Cc: git@vger.kernel.org, Elijah Newren <newren@gmail.com>
Subject: Re: [PATCH] git-rebase.txt: fix description list separator
Date: Thu, 09 Jul 2020 11:36:13 -0700 [thread overview]
Message-ID: <xmqqwo3cwn6q.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <20200709182438.17355-1-martin.agren@gmail.com> ("Martin Ågren"'s message of "Thu, 9 Jul 2020 20:24:38 +0200")
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.
prev parent reply other threads:[~2020-07-09 18:36 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-09 18:24 [PATCH] git-rebase.txt: fix description list separator Martin Ågren
2020-07-09 18:36 ` Junio C Hamano [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqwo3cwn6q.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=martin.agren@gmail.com \
--cc=newren@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public 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).