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

diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index c2325ef90..d43416d29 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -58,9 +58,14 @@ 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
-	used to give a good default for automated 'git merge'
-	invocations.
+	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.
 
 --rerere-autoupdate::
 --no-rerere-autoupdate::