From: Felipe Contreras <felipe.contreras@gmail.com>
To: Jeff King <peff@peff.net>, Felipe Contreras <felipe.contreras@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: [PATCH 1/2] doc: git-checkout: trivial callout cleanup
Date: Tue, 02 May 2023 10:05:59 -0600 [thread overview]
Message-ID: <645134e7619b0_1ba2d294a7@chronos.notmuch> (raw)
In-Reply-To: <20230502101854.GA1180695@coredump.intra.peff.net>
Jeff King wrote:
> On Thu, Apr 27, 2023 at 04:09:32PM -0600, Felipe Contreras wrote:
>
> > > Using just a blank line between the code block and the call-out list
> > > (instead of the "+") works for asciidoc (it is happy to keep the two
> > > together) but not asciidoctor (it ends the outer ordered list before
> > > starting the callout list).
> >
> > I don't know what you mean.
>
> For reference, I meant this:
>
> diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
> index 6bb32ab460..ed32497290 100644
> --- a/Documentation/git-checkout.txt
> +++ b/Documentation/git-checkout.txt
> @@ -529,7 +529,7 @@ $ git checkout master~2 Makefile <2>
> $ rm -f hello.c
> $ git checkout hello.c <3>
> ------------
> -+
> +
> <1> switch branch
> <2> take a file out of another commit
> <3> restore `hello.c` from the index
>
> which asciidoc renders the same, but asciidoctor is not.
I see. I would say the code is ambiguous, so it's not surprising that a parser
interprets it as an end of a list element.
--
Felipe Contreras
next prev parent reply other threads:[~2023-05-02 16:06 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-18 7:00 [PATCH 0/2] doc: git-checkout: trivial style improvements Felipe Contreras
2023-04-18 7:00 ` [PATCH 1/2] doc: git-checkout: trivial callout cleanup Felipe Contreras
2023-04-19 19:37 ` Junio C Hamano
2023-04-24 13:28 ` Felipe Contreras
2023-04-25 0:02 ` Junio C Hamano
2023-04-25 6:10 ` Jeff King
2023-04-27 22:09 ` Felipe Contreras
2023-05-02 10:18 ` Jeff King
2023-05-02 16:05 ` Felipe Contreras [this message]
2023-05-03 6:09 ` Junio C Hamano
2023-05-03 13:46 ` Felipe Contreras
2023-05-03 17:44 ` Junio C Hamano
2023-04-27 21:30 ` Felipe Contreras
2023-04-18 7:00 ` [PATCH 2/2] doc: git-checkout: reorganize examples Felipe Contreras
2023-04-19 19:37 ` Junio C Hamano
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=645134e7619b0_1ba2d294a7@chronos.notmuch \
--to=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/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).