Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jn/stripspace-wo-repository'
[gitweb.git]
/
Documentation
/
git-fmt-merge-msg.txt
diff --git
a/Documentation/git-fmt-merge-msg.txt
b/Documentation/git-fmt-merge-msg.txt
index 423b6e033ba512f8a8ed6fe3f0ee6ef158dd5234..6793d8fc05218f61ebc399b9ac910f27832bc58b 100644
(file)
--- a/
Documentation/git-fmt-merge-msg.txt
+++ b/
Documentation/git-fmt-merge-msg.txt
@@
-51,7
+51,7
@@
OPTIONS
CONFIGURATION
-------------
-include::
fmt-merge-msg-confi
g.txt[]
+include::
config/fmt-merge-ms
g.txt[]
merge.summary::
Synonym to `merge.log`; this is deprecated and will be removed in