# [PATCH] Documenation: fmt-merge-msg: fix markup in example 6 messages from 2016-10-28 to 2016-10-28. Participants: Stefan Christ, Robert P. J. Day, Jeff King, Junio C Hamano. Thread: https://gitlist.dev/t/44388 ## Stefan Christ, 2016-10-28 10:01 Subject: [PATCH] Documenation: fmt-merge-msg: fix markup in example Message-ID: <1477648886-12096-1-git-send-email-contact@stefanchrist.eu> URL: https://gitlist.dev/e/1477648886-12096-1-git-send-email-contact%40stefanchrist.eu ``` The example was not rendered as verbatim text. Fix it. Signed-off-by: Stefan Christ --- Documentation/git-fmt-merge-msg.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 --- +--------- Print a log message describing a merge of the "master" branch from the "origin" remote. -- 2.7.3 ``` ## Robert P. J. Day, 2016-10-28 10:24 Subject: Re: [PATCH] Documenation: fmt-merge-msg: fix markup in example Message-ID: URL: https://gitlist.dev/e/alpine.LFD.2.20.1610280623400.524%40localhost.localdomain In-Reply-To: <1477648886-12096-1-git-send-email-contact@stefanchrist.eu> ``` "Documenation"? rday -- ======================================================================== Robert P. J. Day Ottawa, Ontario, CANADA http://crashcourse.ca Twitter: http://twitter.com/rpjday LinkedIn: http://ca.linkedin.com/in/rpjday ======================================================================== ``` ## Jeff King, 2016-10-28 11:08 Subject: Re: [PATCH] Documenation: fmt-merge-msg: fix markup in example Message-ID: <20161028110820.a46ttxjicq2k5xdk@sigill.intra.peff.net> URL: https://gitlist.dev/e/20161028110820.a46ttxjicq2k5xdk%40sigill.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: > 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 ``` ## Stefan Christ, 2016-10-28 15:07 Subject: [PATCH v2] Documentation: fmt-merge-msg: fix markup in example Message-ID: <1477667244-17887-1-git-send-email-contact@stefanchrist.eu> URL: https://gitlist.dev/e/1477667244-17887-1-git-send-email-contact%40stefanchrist.eu In-Reply-To: ``` The example was not rendered as verbatim text. Fix it. Signed-off-by: Stefan Christ --- v2: fix misspelling in subject Hi, thanks to rday for spotting the typo in the subject line (I missed to autoenable the spell checking in vim) and thanks to Peff for the asciidoc explanation. Kind regards, Stefan Christ --- Documentation/git-fmt-merge-msg.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 --- +--------- Print a log message describing a merge of the "master" branch from the "origin" remote. -- 2.7.3 ``` ## Junio C Hamano, 2016-10-28 15:15 Subject: Re: [PATCH] Documenation: fmt-merge-msg: fix markup in example Message-ID: URL: https://gitlist.dev/e/xmqq4m3w33o2.fsf%40gitster.mtv.corp.google.com In-Reply-To: <20161028110820.a46ttxjicq2k5xdk@sigill.intra.peff.net> ``` Jeff King 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. -- >8 -- From: Stefan Christ Date: Fri, 28 Oct 2016 12:01:26 +0200 Subject: [PATCH] Documentation/fmt-merge-msg: fix markup in example Use at least 4 delimiting dashes that are required for ListingBlock to get this block rendered as verbatim text. Signed-off-by: Stefan Christ Signed-off-by: Junio C Hamano --- Documentation/git-fmt-merge-msg.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/git-fmt-merge-msg.txt b/Documentation/git-fmt-merge-msg.txt index 6526b178e8..44892c447e 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 --- +--------- Print a log message describing a merge of the "master" branch from the "origin" remote. -- 2.10.1-791-g404733b9cf ``` ## Stefan Christ, 2016-10-28 23:19 Subject: Re: [PATCH] Documenation: fmt-merge-msg: fix markup in example Message-ID: <20161028231909.GA697@sill.h.stcim.de> URL: https://gitlist.dev/e/20161028231909.GA697%40sill.h.stcim.de In-Reply-To: ``` Hi, On Fri, Oct 28, 2016 at 08:15:57AM -0700, Junio C Hamano wrote: > Jeff King 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 ```