Documentation: don't assume git-sh-setup and git-parse-remote are in PATH

diff --git a/Documentation/git-fmt-merge-msg.txt b/Documentation/git-fmt-merge-msg.txt
index 328cc542dcf29fe08289004ad1c7f2af9de8645d..2a7cfb980b7f0b6fa2bd741b3601467f07025691 100644 (file)
--- a/Documentation/git-fmt-merge-msg.txt
+++ b/Documentation/git-fmt-merge-msg.txt
@@ -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.