Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Documentation/fmt-merge-msg: fix markup in example
author
Stefan Christ
<contact@stefanchrist.eu>
Fri, 28 Oct 2016 10:01:26 +0000
(12:01 +0200)
committer
Junio C Hamano
<gitster@pobox.com>
Fri, 28 Oct 2016 12:51:51 +0000
(
05:51
-0700)
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>
Documentation/git-fmt-merge-msg.txt
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
0b65a8d
)
diff --git
a/Documentation/git-fmt-merge-msg.txt
b/Documentation/git-fmt-merge-msg.txt
index 6526b178e87f9cbf1c2032bd63023295cf1d190e..44892c447e79f1d06435357b30f4ddbbb465e5f1 100644
(file)
--- 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.