Merge branch 'os/fix-rebase-diff-no-prefix'

[git.git] / Documentation / git-fmt-merge-msg.txt

diff --git a/Documentation/git-fmt-merge-msg.txt b/Documentation/git-fmt-merge-msg.txt
index a586950b48bac6eda630383714c0ccd1b28820a8..302f56b88941cfaa002a8b75c078335bf8d86276 100644 (file)
--- a/Documentation/git-fmt-merge-msg.txt
+++ b/Documentation/git-fmt-merge-msg.txt
@@ -9,14 +9,14 @@ git-fmt-merge-msg - Produce a merge commit message
 SYNOPSIS
 --------
 [verse]
 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' [-m <message>] [--log | --no-log] <$GIT_DIR/FETCH_HEAD
+'git fmt-merge-msg' [-m <message>] [--log | --no-log] -F <file>

 
 DESCRIPTION
 -----------
 Takes the list of merged objects on stdin and produces a suitable
 commit message to be used for the merge commit, usually to be
 
 DESCRIPTION
 -----------
 Takes the list of merged objects on stdin and produces a suitable
 commit message to be used for the merge commit, usually to be

-passed as the '<merge-message>' argument of 'git-merge'.
+passed as the '<merge-message>' argument of 'git merge'.

 
 This command is intended mostly for internal use by scripts
 automatically invoking 'git merge'.
 
 This command is intended mostly for internal use by scripts
 automatically invoking 'git merge'.


@@ -38,6 +38,11 @@ OPTIONS
        Synonyms to --log and --no-log; these are deprecated and will be
        removed in the future.
 
        Synonyms to --log and --no-log; these are deprecated and will be
        removed in the future.
 

+-m <message>::
+--message <message>::
+       Use <message> instead of the branch names for the first line
+       of the log message.  For use with `--log`.
+

 -F <file>::
 --file <file>::
        Take the list of merged objects from <file> instead of
 -F <file>::
 --file <file>::
        Take the list of merged objects from <file> instead of