summaryrefslogtreecommitdiff
path: root/Documentation/git-fmt-merge-msg.txt
diff options
context:
space:
mode:
authorFelipe Contreras <felipe.contreras@gmail.com>2013-05-09 01:16:55 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-05-17 19:09:21 (GMT)
commit0460ed2c93d78c753242f835c441f320f792ac54 (patch)
tree7128ca5567b1ed56dba60845ad26b32c40d7a4f5 /Documentation/git-fmt-merge-msg.txt
parent9b795193a6a7e963db62d9cd8e86752a40940520 (diff)
downloadgit-0460ed2c93d78c753242f835c441f320f792ac54.zip
git-0460ed2c93d78c753242f835c441f320f792ac54.tar.gz
git-0460ed2c93d78c753242f835c441f320f792ac54.tar.bz2
documentation: trivial style cleanups
White-spaces, missing braces, standardize --[no-]foo. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-fmt-merge-msg.txt')
-rw-r--r--Documentation/git-fmt-merge-msg.txt3
1 files changed, 1 insertions, 2 deletions
diff --git a/Documentation/git-fmt-merge-msg.txt b/Documentation/git-fmt-merge-msg.txt
index 3a0f55e..bb1232a 100644
--- 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.