* [PATCH] Documenation: fmt-merge-msg: fix markup in example @ 2016-10-28 10:01 Stefan Christ 2016-10-28 10:24 ` Robert P. J. Day 2016-10-28 11:08 ` [PATCH] Documenation: " Jeff King 0 siblings, 2 replies; 6+ messages in thread From: Stefan Christ @ 2016-10-28 10:01 UTC (permalink / raw) To: git The example was not rendered as verbatim text. Fix it. Signed-off-by: Stefan Christ <contact@stefanchrist.eu> --- 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 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] Documenation: fmt-merge-msg: fix markup in example 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 1 sibling, 1 reply; 6+ messages in thread From: Robert P. J. Day @ 2016-10-28 10:24 UTC (permalink / raw) To: Stefan Christ; +Cc: git "Documenation"? rday -- ======================================================================== Robert P. J. Day Ottawa, Ontario, CANADA http://crashcourse.ca Twitter: http://twitter.com/rpjday LinkedIn: http://ca.linkedin.com/in/rpjday ======================================================================== ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2] Documentation: fmt-merge-msg: fix markup in example 2016-10-28 10:24 ` Robert P. J. Day @ 2016-10-28 15:07 ` Stefan Christ 0 siblings, 0 replies; 6+ messages in thread From: Stefan Christ @ 2016-10-28 15:07 UTC (permalink / raw) To: git; +Cc: rpjday, peff The example was not rendered as verbatim text. Fix it. Signed-off-by: Stefan Christ <contact@stefanchrist.eu> --- 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 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] Documenation: fmt-merge-msg: fix markup in example 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 11:08 ` Jeff King 2016-10-28 15:15 ` Junio C Hamano 1 sibling, 1 reply; 6+ messages in thread From: Jeff King @ 2016-10-28 11:08 UTC (permalink / raw) To: Stefan Christ; +Cc: git 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 ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Documenation: fmt-merge-msg: fix markup in example 2016-10-28 11:08 ` [PATCH] Documenation: " Jeff King @ 2016-10-28 15:15 ` Junio C Hamano 2016-10-28 23:19 ` Stefan Christ 0 siblings, 1 reply; 6+ messages in thread From: Junio C Hamano @ 2016-10-28 15:15 UTC (permalink / raw) To: Jeff King; +Cc: Stefan Christ, git 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. -- >8 -- From: Stefan Christ <contact@stefanchrist.eu> 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 <contact@stefanchrist.eu> Signed-off-by: Junio C Hamano <gitster@pobox.com> --- 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 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] Documenation: fmt-merge-msg: fix markup in example 2016-10-28 15:15 ` Junio C Hamano @ 2016-10-28 23:19 ` Stefan Christ 0 siblings, 0 replies; 6+ messages in thread From: Stefan Christ @ 2016-10-28 23:19 UTC (permalink / raw) To: Junio C Hamano; +Cc: Jeff King, git 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 ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-10-28 23:20 UTC | newest] Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 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 is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.