{"thread":{"id":"44388","subject":"[PATCH] Documenation: fmt-merge-msg: fix markup in example","startedAt":"2016-10-28T10:21:13Z","lastAt":"2016-10-28T23:20:30Z","messageCount":6,"participants":["Stefan Christ","Robert P. J. Day","Jeff King","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"305051","messageId":"1477648886-12096-1-git-send-email-contact@stefanchrist.eu","threadId":"44388","inReplyTo":null,"subject":"[PATCH] Documenation: fmt-merge-msg: fix markup in example","fromName":"Stefan Christ","fromEmail":"contact@stefanchrist.eu","sentAt":"2016-10-28T10:01:26Z","receivedAt":"2016-10-28T10:21:13Z","isPatch":true,"sender":{"key":"contact@stefanchrist.eu","avatar":null},"body":"The example was not rendered as verbatim text. Fix it.\n\nSigned-off-by: Stefan Christ <contact@stefanchrist.eu>\n---\n Documentation/git-fmt-merge-msg.txt | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/git-fmt-merge-msg.txt b/Documentation/git-fmt-merge-msg.txt\nindex 6526b17..44892c4 100644\n--- a/Documentation/git-fmt-merge-msg.txt\n+++ b/Documentation/git-fmt-merge-msg.txt\n@@ -60,10 +60,10 @@ merge.summary::\n EXAMPLE\n -------\n \n---\n+---------\n $ git fetch origin master\n $ git fmt-merge-msg --log <$GIT_DIR/FETCH_HEAD\n---\n+---------\n \n Print a log message describing a merge of the \"master\" branch from\n the \"origin\" remote.\n-- \n2.7.3\n\n"},{"id":"305052","messageId":"alpine.LFD.2.20.1610280623400.524@localhost.localdomain","threadId":"44388","inReplyTo":"1477648886-12096-1-git-send-email-contact@stefanchrist.eu","subject":"Re: [PATCH] Documenation: fmt-merge-msg: fix markup in example","fromName":"Robert P. J. Day","fromEmail":"rpjday@crashcourse.ca","sentAt":"2016-10-28T10:24:03Z","receivedAt":"2016-10-28T10:36:29Z","isPatch":true,"sender":{"key":"rpjday@crashcourse.ca","avatar":"https://avatars.githubusercontent.com/u/226084077?v=4"},"body":"\n  \"Documenation\"?\n\nrday\n\n-- \n\n========================================================================\nRobert P. J. Day                                 Ottawa, Ontario, CANADA\n                        http://crashcourse.ca\n\nTwitter:                                       http://twitter.com/rpjday\nLinkedIn:                               http://ca.linkedin.com/in/rpjday\n========================================================================\n\n"},{"id":"305053","messageId":"20161028110820.a46ttxjicq2k5xdk@sigill.intra.peff.net","threadId":"44388","inReplyTo":"1477648886-12096-1-git-send-email-contact@stefanchrist.eu","subject":"Re: [PATCH] Documenation: fmt-merge-msg: fix markup in example","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2016-10-28T11:08:20Z","receivedAt":"2016-10-28T11:08:28Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Fri, Oct 28, 2016 at 12:01:26PM +0200, Stefan Christ wrote:\n\n> diff --git a/Documentation/git-fmt-merge-msg.txt b/Documentation/git-fmt-merge-msg.txt\n> index 6526b17..44892c4 100644\n> --- a/Documentation/git-fmt-merge-msg.txt\n> +++ b/Documentation/git-fmt-merge-msg.txt\n> @@ -60,10 +60,10 @@ merge.summary::\n>  EXAMPLE\n>  -------\n>  \n> ---\n> +---------\n>  $ git fetch origin master\n>  $ git fmt-merge-msg --log <$GIT_DIR/FETCH_HEAD\n> ---\n> +---------\n\nThanks. Asciidoc generally requires at least 4 delimiter characters to\nopen a delimited block (including a ListingBlock, which is what we want\nhere). There is one exception, \"--\", which is a generic OpenBlock, which\nis just used for grouping, and not any special syntactic meaning (so\nthat's why this _didn't_ render the \"--\", but did render the contents\nwithout line breaks).\n\nSo looks good, modulo the typo in the subject that somebody else pointed\nout.\n\n-Peff\n"},{"id":"305063","messageId":"1477667244-17887-1-git-send-email-contact@stefanchrist.eu","threadId":"44388","inReplyTo":"alpine.LFD.2.20.1610280623400.524@localhost.localdomain","subject":"[PATCH v2] Documentation: fmt-merge-msg: fix markup in example","fromName":"Stefan Christ","fromEmail":"contact@stefanchrist.eu","sentAt":"2016-10-28T15:07:24Z","receivedAt":"2016-10-28T15:08:13Z","isPatch":true,"sender":{"key":"contact@stefanchrist.eu","avatar":null},"body":"The example was not rendered as verbatim text. Fix it.\n\nSigned-off-by: Stefan Christ <contact@stefanchrist.eu>\n---\nv2: fix misspelling in subject\n\nHi,\n\nthanks to rday for spotting the typo in the subject line (I missed to\nautoenable the spell checking in vim) and thanks to Peff for the asciidoc\nexplanation.\n\nKind regards,\n\tStefan Christ\n---\n Documentation/git-fmt-merge-msg.txt | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/git-fmt-merge-msg.txt b/Documentation/git-fmt-merge-msg.txt\nindex 6526b17..44892c4 100644\n--- a/Documentation/git-fmt-merge-msg.txt\n+++ b/Documentation/git-fmt-merge-msg.txt\n@@ -60,10 +60,10 @@ merge.summary::\n EXAMPLE\n -------\n \n---\n+---------\n $ git fetch origin master\n $ git fmt-merge-msg --log <$GIT_DIR/FETCH_HEAD\n---\n+---------\n \n Print a log message describing a merge of the \"master\" branch from\n the \"origin\" remote.\n-- \n2.7.3\n\n"},{"id":"305064","messageId":"xmqq4m3w33o2.fsf@gitster.mtv.corp.google.com","threadId":"44388","inReplyTo":"20161028110820.a46ttxjicq2k5xdk@sigill.intra.peff.net","subject":"Re: [PATCH] Documenation: fmt-merge-msg: fix markup in example","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2016-10-28T15:15:57Z","receivedAt":"2016-10-28T15:16:06Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jeff King <peff@peff.net> writes:\n\n> On Fri, Oct 28, 2016 at 12:01:26PM +0200, Stefan Christ wrote:\n>\n>> diff --git a/Documentation/git-fmt-merge-msg.txt b/Documentation/git-fmt-merge-msg.txt\n>> index 6526b17..44892c4 100644\n>> --- a/Documentation/git-fmt-merge-msg.txt\n>> +++ b/Documentation/git-fmt-merge-msg.txt\n>> @@ -60,10 +60,10 @@ merge.summary::\n>>  EXAMPLE\n>>  -------\n>>  \n>> ---\n>> +---------\n>>  $ git fetch origin master\n>>  $ git fmt-merge-msg --log <$GIT_DIR/FETCH_HEAD\n>> ---\n>> +---------\n>\n> Thanks. Asciidoc generally requires at least 4 delimiter characters to\n> open a delimited block (including a ListingBlock, which is what we want\n> here). There is one exception, \"--\", which is a generic OpenBlock, which\n> is just used for grouping, and not any special syntactic meaning (so\n> that's why this _didn't_ render the \"--\", but did render the contents\n> without line breaks).\n>\n> So looks good, modulo the typo in the subject that somebody else pointed\n> out.\n\nThanks, both.  I queued with a bit more enhanced log message while\nfixing the typo.\n\n-- >8 --\nFrom: Stefan Christ <contact@stefanchrist.eu>\nDate: Fri, 28 Oct 2016 12:01:26 +0200\nSubject: [PATCH] Documentation/fmt-merge-msg: fix markup in example\n\nUse at least 4 delimiting dashes that are required for\nListingBlock to get this block rendered as verbatim text.\n\nSigned-off-by: Stefan Christ <contact@stefanchrist.eu>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>\n---\n Documentation/git-fmt-merge-msg.txt | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/git-fmt-merge-msg.txt b/Documentation/git-fmt-merge-msg.txt\nindex 6526b178e8..44892c447e 100644\n--- a/Documentation/git-fmt-merge-msg.txt\n+++ b/Documentation/git-fmt-merge-msg.txt\n@@ -60,10 +60,10 @@ merge.summary::\n EXAMPLE\n -------\n \n---\n+---------\n $ git fetch origin master\n $ git fmt-merge-msg --log <$GIT_DIR/FETCH_HEAD\n---\n+---------\n \n Print a log message describing a merge of the \"master\" branch from\n the \"origin\" remote.\n-- \n2.10.1-791-g404733b9cf\n\n"},{"id":"305140","messageId":"20161028231909.GA697@sill.h.stcim.de","threadId":"44388","inReplyTo":"xmqq4m3w33o2.fsf@gitster.mtv.corp.google.com","subject":"Re: [PATCH] Documenation: fmt-merge-msg: fix markup in example","fromName":"Stefan Christ","fromEmail":"contact@stefanchrist.eu","sentAt":"2016-10-28T23:19:09Z","receivedAt":"2016-10-28T23:20:30Z","isPatch":true,"sender":{"key":"contact@stefanchrist.eu","avatar":null},"body":"Hi, \n\nOn Fri, Oct 28, 2016 at 08:15:57AM -0700, Junio C Hamano wrote:\n> Jeff King <peff@peff.net> writes:\n> \n> > On Fri, Oct 28, 2016 at 12:01:26PM +0200, Stefan Christ wrote:\n> >\n> >> diff --git a/Documentation/git-fmt-merge-msg.txt b/Documentation/git-fmt-merge-msg.txt\n> >> index 6526b17..44892c4 100644\n> >> --- a/Documentation/git-fmt-merge-msg.txt\n> >> +++ b/Documentation/git-fmt-merge-msg.txt\n> >> @@ -60,10 +60,10 @@ merge.summary::\n> >>  EXAMPLE\n> >>  -------\n> >>  \n> >> ---\n> >> +---------\n> >>  $ git fetch origin master\n> >>  $ git fmt-merge-msg --log <$GIT_DIR/FETCH_HEAD\n> >> ---\n> >> +---------\n> >\n> > Thanks. Asciidoc generally requires at least 4 delimiter characters to\n> > open a delimited block (including a ListingBlock, which is what we want\n> > here). There is one exception, \"--\", which is a generic OpenBlock, which\n> > is just used for grouping, and not any special syntactic meaning (so\n> > that's why this _didn't_ render the \"--\", but did render the contents\n> > without line breaks).\n> >\n> > So looks good, modulo the typo in the subject that somebody else pointed\n> > out.\n> \n> Thanks, both.  I queued with a bit more enhanced log message while\n> fixing the typo.\n> \n\nI'm totally ok with these changes. Thanks.\n\nKind Regards,\n\tStefan Christ\n"}]}