Re: [PATCH] Documenation: fmt-merge-msg: fix markup in example

From: Jeff King <peff@peff.net>
Date: Oct 28, 2016, 11:08 UTC
Message-ID: <20161028110820.a46ttxjicq2k5xdk@sigill.intra.peff.net>
In-Reply-To: <1477648886-12096-1-git-send-email-contact@stefanchrist.eu>

On Fri, Oct 28, 2016 at 12:01:26PM +0200, Stefan Christ wrote:

Show 14 quoted lines

> diff --git a/Documentation/git-fmt-merge-msg.txt b/Documentation/git-fmt-merge-msg.txt
> index 6526b17..44892c4 100644
> --- a/Documentation/git-fmt-merge-msg.txt
> +++ b/Documentation/git-fmt-merge-msg.txt
> @@ -60,10 +60,10 @@ merge.summary::
>  EXAMPLE
>  -------
>  
> ---
> +---------
>  $ git fetch origin master
>  $ git fmt-merge-msg --log <$GIT_DIR/FETCH_HEAD
> ---
> +---------

Thanks. Asciidoc generally requires at least 4 delimiter characters to open a delimited block (including a ListingBlock, which is what we want here). There is one exception, "--", which is a generic OpenBlock, which is just used for grouping, and not any special syntactic meaning (so that's why this _didn't_ render the "--", but did render the contents without line breaks).

So looks good, modulo the typo in the subject that somebody else pointed out.

-Peff