Merge branch 'j6t/mingw'

diff --git a/Documentation/git-fmt-merge-msg.txt b/Documentation/git-fmt-merge-msg.txt
index 457cf425619dc1680fae510aceb20574b02be602..ddb89f8d60f112e507195b83e83048d727006611 100644 (file)
--- a/Documentation/git-fmt-merge-msg.txt
+++ b/Documentation/git-fmt-merge-msg.txt
@@ -9,8 +9,8 @@ git-fmt-merge-msg - Produce a merge commit message
 SYNOPSIS
 --------
 [verse]
-git-fmt-merge-msg [--log | --no-log] <$GIT_DIR/FETCH_HEAD
-git-fmt-merge-msg [--log | --no-log] -F <file>
+'git fmt-merge-msg' [--log | --no-log] <$GIT_DIR/FETCH_HEAD
+'git fmt-merge-msg' [--log | --no-log] -F <file>
 
 DESCRIPTION
 -----------
@@ -33,11 +33,13 @@ OPTIONS
        Do not list one-line descriptions from the actual commits being
        merged.
 
---summary,--no-summary::
+--summary::
+--no-summary::
        Synonyms to --log and --no-log; these are deprecated and will be
        removed in the future.
 
---file <file>, -F <file>::
+-F <file>::
+--file <file>::
        Take the list of merged objects from <file> instead of
        stdin.
 
@@ -67,4 +69,4 @@ Documentation by Petr Baudis, Junio C Hamano and the git-list <git@vger.kernel.o
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite