From: Stefan Christ <contact@stefanchrist.eu>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jeff King <peff@peff.net>, git@vger.kernel.org
Subject: Re: [PATCH] Documenation: fmt-merge-msg: fix markup in example
Date: Sat, 29 Oct 2016 01:19:09 +0200 [thread overview]
Message-ID: <20161028231909.GA697@sill.h.stcim.de> (raw)
In-Reply-To: <xmqq4m3w33o2.fsf@gitster.mtv.corp.google.com>
Hi,
On Fri, Oct 28, 2016 at 08:15:57AM -0700, Junio C Hamano wrote:
> Jeff King <peff@peff.net> writes:
>
> > On Fri, Oct 28, 2016 at 12:01:26PM +0200, Stefan Christ wrote:
> >
> >> 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.
>
> Thanks, both. I queued with a bit more enhanced log message while
> fixing the typo.
>
I'm totally ok with these changes. Thanks.
Kind Regards,
Stefan Christ
prev parent reply other threads:[~2016-10-28 23:20 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-28 10:01 [PATCH] Documenation: fmt-merge-msg: fix markup in example Stefan Christ
2016-10-28 10:24 ` Robert P. J. Day
2016-10-28 15:07 ` [PATCH v2] Documentation: " Stefan Christ
2016-10-28 11:08 ` [PATCH] Documenation: " Jeff King
2016-10-28 15:15 ` Junio C Hamano
2016-10-28 23:19 ` Stefan Christ [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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161028231909.GA697@sill.h.stcim.de \
--to=contact@stefanchrist.eu \
--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.
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).