X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-merge.txt;h=84043cc5b26db7d34c93a70ec005df913c345d85;hb=1ae96444104c2bd9c653658fef79ef543559ad27;hp=c2325ef90e336a37df42eb7f71f95e3581c83127;hpb=356169c1f66287629ea08e8c9c6e27b00ff8707a;p=git.git

diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index c2325ef90..84043cc5b 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -58,7 +58,12 @@ include::merge-options.txt[]
 
 -m <msg>::
 	Set the commit message to be used for the merge commit (in
-	case one is created). The 'git fmt-merge-msg' command can be
+	case one is created).
+
+	If `--log` is specified, a shortlog of the commits being merged
+	will be appended to the specified message.
+
+	The 'git fmt-merge-msg' command can be
 	used to give a good default for automated 'git merge'
 	invocations.