Merge branch 'ph/parseopt-sh'

diff --git a/Documentation/git-fmt-merge-msg.txt b/Documentation/git-fmt-merge-msg.txt
index e560b30c571c793bff428ec32ca510bec7595155..7088ed4095a5040cb78ca97f72e4148e863d362f 100644 (file)
--- a/Documentation/git-fmt-merge-msg.txt
+++ b/Documentation/git-fmt-merge-msg.txt
@@ -8,8 +8,9 @@ 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>
+git-fmt-merge-msg [--summary | --no-summary] -F <file>
 
 DESCRIPTION
 -----------
@@ -59,4 +60,3 @@ Documentation by Petr Baudis, Junio C Hamano and the git-list <git@vger.kernel.o
 GIT
 ---
 Part of the gitlink:git[7] suite
-