|
|
|
@ -59,10 +59,10 @@ include::merge-options.txt[] |
|
|
|
-m <msg>:: |
|
|
|
-m <msg>:: |
|
|
|
Set the commit message to be used for the merge commit (in |
|
|
|
Set the commit message to be used for the merge commit (in |
|
|
|
case one is created). |
|
|
|
case one is created). |
|
|
|
|
|
|
|
+ |
|
|
|
If `--log` is specified, a shortlog of the commits being merged |
|
|
|
If `--log` is specified, a shortlog of the commits being merged |
|
|
|
will be appended to the specified message. |
|
|
|
will be appended to the specified message. |
|
|
|
|
|
|
|
+ |
|
|
|
The 'git fmt-merge-msg' command can be |
|
|
|
The 'git fmt-merge-msg' command can be |
|
|
|
used to give a good default for automated 'git merge' |
|
|
|
used to give a good default for automated 'git merge' |
|
|
|
invocations. |
|
|
|
invocations. |
|
|
|
|
Junio C Hamano
14 years ago