summaryrefslogtreecommitdiff
path: root/Documentation/git-fmt-merge-msg.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-05-18 21:50:56 -0700
committerJunio C Hamano <junkio@cox.net>2007-05-18 21:50:56 -0700
commit404fdef22f1084141aeef5781d5a322554fed481 (patch)
treeabfce65899ec3856f636d9ff5465a8d962296398 /Documentation/git-fmt-merge-msg.txt
parent2ff3f61ab6125edc53e4da8065b787bd10d0fdbb (diff)
parent97925fde00743e557fa5e792004483a27e31fbd8 (diff)
downloadgit-404fdef22f1084141aeef5781d5a322554fed481.tar.gz
Merge branch 'maint'
* maint: Documentation: Reformatted SYNOPSIS for several commands Documentation: Added [verse] to SYNOPSIS where necessary
Diffstat (limited to 'Documentation/git-fmt-merge-msg.txt')
-rw-r--r--Documentation/git-fmt-merge-msg.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/git-fmt-merge-msg.txt b/Documentation/git-fmt-merge-msg.txt
index e560b30c57..4913c2552f 100644
--- a/Documentation/git-fmt-merge-msg.txt
+++ b/Documentation/git-fmt-merge-msg.txt
@@ -8,6 +8,7 @@ git-fmt-merge-msg - Produce a merge commit message
SYNOPSIS
--------
+[verse]
git-fmt-merge-msg [--summary | --no-summary] <$GIT_DIR/FETCH_HEAD
git-fmt-merge-msg [--summary | --no-summray] -F <file>