index c2325ef90e336a37df42eb7f71f95e3581c83127..d43416d299a7c028a88e8ddce89536c2c64e65c9 100644 (file)
-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::