summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Christ <contact@stefanchrist.eu>2016-10-28 12:01:26 +0200
committerJunio C Hamano <gitster@pobox.com>2016-10-28 05:51:51 -0700
commit4259d693fc09c8aaaf93269a6ecaa6185e0a9999 (patch)
tree60001fe6d0e7673c537e7b6a2e950262aed1e26e
parent0b65a8dbdb38962e700ee16776a3042beb489060 (diff)
downloadgit-4259d693fc09c8aaaf93269a6ecaa6185e0a9999.tar.gz
Documentation/fmt-merge-msg: fix markup in examplesc/fmt-merge-msg-doc-markup-fix
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>
-rw-r--r--Documentation/git-fmt-merge-msg.txt4
1 files 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.