git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Philippe Blain <levraiphilippeblain@gmail.com>
Cc: git@vger.kernel.org, Fernando Ramos <greenfoo@u92.eu>,
	davvid@gmail.com, sunshine@sunshineco.com, seth@eseth.com,
	rogi@skylittlesystem.org
Subject: Re: [PATCH] fixup! vimdiff: add tool documentation
Date: Tue, 29 Mar 2022 09:03:49 -0700	[thread overview]
Message-ID: <xmqqtubgwxsq.fsf@gitster.g> (raw)
In-Reply-To: <20220329125400.63337-1-levraiphilippeblain@gmail.com> (Philippe Blain's message of "Tue, 29 Mar 2022 08:54:00 -0400")

Philippe Blain <levraiphilippeblain@gmail.com> writes:

> Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com>
> ---
>
> Hi Junio, Fernando,
>
> I think the canonical Asciidoc way would be to use a listing block
> (start and end the block with '----', and not indenting the lines
> at all, as is done in a few places in the docs), but in this case
> the parser gets confused about the several dashes in the content of
> the block. So we can use a "literal block" instead [1].
>
> [1] https://docs.asciidoctor.org/asciidoc/latest/verbatim/literal-blocks/

Thanks, will queue on top (without squashing) for now, expecting
that Fernando may want to send in another round of updates (and if
it turns out that this is the only fix-up we need, then we can just
squash it in later before merging the topic to 'next').


  reply	other threads:[~2022-03-29 16:03 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-28 22:30 [PATCH v7 0/4] vimdiff: new implementation with layout support Fernando Ramos
2022-03-28 22:30 ` [PATCH v7 1/4] " Fernando Ramos
2022-03-28 22:30 ` [PATCH v7 2/4] vimdiff: integrate layout tests in the unit tests framework ('t' folder) Fernando Ramos
2022-03-28 22:30 ` [PATCH v7 3/4] vimdiff: add tool documentation Fernando Ramos
2022-03-28 22:39   ` Fernando Ramos
2022-03-29  1:01     ` Junio C Hamano
2022-03-29 12:54       ` [PATCH] fixup! " Philippe Blain
2022-03-29 16:03         ` Junio C Hamano [this message]
2022-03-29 14:07   ` [PATCH v7 3/4] " Philippe Blain
2022-03-29 16:35     ` Junio C Hamano
2022-03-29 17:08       ` Philippe Blain
2022-03-29 17:29   ` Philippe Blain
2022-03-28 22:30 ` [PATCH v7 4/4] vimdiff: add description to already existing diff/merge tools Fernando Ramos
2022-03-29 16:38   ` Junio C Hamano
2022-03-29 17:24     ` Philippe Blain
2022-03-29 18:50       ` Junio C Hamano
2022-03-29 22:39         ` Fernando Ramos
2022-03-29 14:10 ` [PATCH v7 0/4] vimdiff: new implementation with layout support Philippe Blain
2022-03-29 21:45   ` Fernando Ramos
2022-03-29 22:44 ` [PATCH v8 0/5] " Fernando Ramos
2022-03-29 22:44   ` [PATCH v8 1/5] " Fernando Ramos
2022-03-29 22:44   ` [PATCH v8 2/5] vimdiff: integrate layout tests in the unit tests framework ('t' folder) Fernando Ramos
2022-03-29 22:44   ` [PATCH v8 3/5] vimdiff: add tool documentation Fernando Ramos
2022-03-29 22:44   ` [PATCH v8 4/5] mergetools: add description to all diff/merge tools Fernando Ramos
2022-03-29 22:44   ` [PATCH v8 5/5] mergetools: add tools description to `git help config` Fernando Ramos
2022-03-30 12:43     ` Philippe Blain
2022-03-30 18:33       ` Fernando Ramos
2022-03-30 18:45         ` Philippe Blain
2022-03-30 19:19   ` [PATCH v9 0/4] vimdiff: new implementation with layout support Fernando Ramos
2022-03-30 19:19     ` [PATCH v9 1/4] " Fernando Ramos
2022-03-30 19:19     ` [PATCH v9 2/4] vimdiff: integrate layout tests in the unit tests framework ('t' folder) Fernando Ramos
2022-03-30 19:19     ` [PATCH v9 3/4] vimdiff: add tool documentation Fernando Ramos
2022-04-03 20:02       ` Philippe Blain
2022-04-03 22:44         ` Junio C Hamano
2022-04-04 20:00           ` Fernando Ramos
2022-04-04 21:38             ` Junio C Hamano
2022-03-30 19:19     ` [PATCH v9 4/4] mergetools: add description to all diff/merge tools Fernando Ramos
  -- strict thread matches above, loose matches on Subject: below --
2022-03-27 18:28 [PATCH v6 3/3] vimdiff: add tool documentation Philippe Blain
2022-03-27 18:50 ` [PATCH] fixup! " Philippe Blain

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqtubgwxsq.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=davvid@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=greenfoo@u92.eu \
    --cc=levraiphilippeblain@gmail.com \
    --cc=rogi@skylittlesystem.org \
    --cc=seth@eseth.com \
    --cc=sunshine@sunshineco.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.
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 NNTP newsgroup(s).