Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
urlmatch.c: recompute pointer after append_normalized_escapes
[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 3a0f55ec8e273545af3a92a9b886511ac79ba73c..bb1232a52c4f0e4995f1fd38737461165772c239 100644
(file)
--- a/
Documentation/git-fmt-merge-msg.txt
+++ b/
Documentation/git-fmt-merge-msg.txt
@@
-35,8
+35,7
@@
OPTIONS
Do not list one-line descriptions from the actual commits being
merged.
---summary::
---no-summary::
+--[no-]summary::
Synonyms to --log and --no-log; these are deprecated and will be
removed in the future.