diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-06-22 19:31:25 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-22 19:31:25 +0400 |
| commit | e3ed7f721c7bd4ecb5c98a29761ff2b2e6d38336 (patch) | |
| tree | 4ad2c30d66103b9eceba7da7c5ea57ff8a9bf2c7 /Documentation | |
| parent | 958ff4a5973c9858c36c405c2f593cf5172e5e1c (diff) | |
| parent | f0ecac2b70bf6b44b89dfa493abd2f544010b1eb (diff) | |
Merge branch 'tc/merge-m-log' into maint
* tc/merge-m-log:
merge: --log appends shortlog to message if specified
fmt-merge-msg: add function to append shortlog only
fmt-merge-msg: refactor merge title formatting
fmt-merge-msg: minor refactor of fmt_merge_msg()
merge: rename variable
merge: update comment
t7604-merge-custom-message: show that --log doesn't append to -m
t7604-merge-custom-message: shift expected output creation
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-merge.txt | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index c2325ef90e..84043cc5b2 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. |