aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-10-31 13:15:26 -0700
committerJunio C Hamano <gitster@pobox.com>2016-10-31 13:15:26 -0700
commit590f0bfe9f8c97fe64a32354191b135d136d6f3a (patch)
treef655f106856f45dc8f007ce22595e1162cf64b31
parentda14d73d5eacfb2fa9d054f94d9eecb2244c3ce5 (diff)
parent4259d693fc09c8aaaf93269a6ecaa6185e0a9999 (diff)
downloadgit-590f0bfe9f8c97fe64a32354191b135d136d6f3a.tar.gz
git-590f0bfe9f8c97fe64a32354191b135d136d6f3a.tar.xz
Merge branch 'sc/fmt-merge-msg-doc-markup-fix'
Documentation fix. * sc/fmt-merge-msg-doc-markup-fix: Documentation/fmt-merge-msg: fix markup in example
-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 6526b178e..44892c447 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.