summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-11-29 21:27:59 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-11-29 21:28:00 (GMT)
commit6afadbd5ee4557982a7c049bb5bb539a5b21775f (patch)
tree5ddafc3a2444440a239bfb900f309f4a34affb70 /Documentation
parentc8a3ec37abe5395e4f4c14d5e9f0ab8077140f1b (diff)
parent4259d693fc09c8aaaf93269a6ecaa6185e0a9999 (diff)
downloadgit-6afadbd5ee4557982a7c049bb5bb539a5b21775f.zip
git-6afadbd5ee4557982a7c049bb5bb539a5b21775f.tar.gz
git-6afadbd5ee4557982a7c049bb5bb539a5b21775f.tar.bz2
Merge branch 'sc/fmt-merge-msg-doc-markup-fix' into maint
Documentation fix. * sc/fmt-merge-msg-doc-markup-fix: Documentation/fmt-merge-msg: fix markup in example
Diffstat (limited to 'Documentation')
-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 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.