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

Subsystems: documentation, the rest

STALE3570d

4 messages, 3 authors, 2016-10-28 · open the first message on its own page

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

From: Stefan Christ <hidden>
Date: 2016-10-28 10:21:13

The example was not rendered as verbatim text. Fix it.

Signed-off-by: Stefan Christ <redacted>
---
 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

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

From: Robert P. J. Day <hidden>
Date: 2016-10-28 10:36:29

  "Documenation"?

rday

-- 

========================================================================
Robert P. J. Day                                 Ottawa, Ontario, CANADA
                        http://crashcourse.ca

Twitter:                                       http://twitter.com/rpjday
LinkedIn:                               http://ca.linkedin.com/in/rpjday
========================================================================

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

From: Jeff King <hidden>
Date: 2016-10-28 11:08:28

On Fri, Oct 28, 2016 at 12:01:26PM +0200, Stefan Christ wrote:
quoted hunk
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

[PATCH v2] Documentation: fmt-merge-msg: fix markup in example

From: Stefan Christ <hidden>
Date: 2016-10-28 15:08:13

The example was not rendered as verbatim text. Fix it.

Signed-off-by: Stefan Christ <redacted>
---
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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help