![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 22 Jun 2010 15:31:25 +0000 (08:31 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 22 Jun 2010 15:31:25 +0000 (08:31 -0700) | ||
| commit | e3ed7f721c7bd4ecb5c98a29761ff2b2e6d38336 | |
| tree | 4ad2c30d66103b9eceba7da7c5ea57ff8a9bf2c7 | tree | snapshot |
| parent | 958ff4a5973c9858c36c405c2f593cf5172e5e1c | commit | diff |
| parent | f0ecac2b70bf6b44b89dfa493abd2f544010b1eb | commit | 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
* 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