git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 958ff4a f0ecac2)
Merge branch 'tc/merge-m-log' into maint
authorJunio C Hamano <redacted>
Tue, 22 Jun 2010 15:31:25 +0000 (08:31 -0700)
committerJunio C Hamano <redacted>
Tue, 22 Jun 2010 15:31:25 +0000 (08:31 -0700)
commite3ed7f721c7bd4ecb5c98a29761ff2b2e6d38336
tree4ad2c30d66103b9eceba7da7c5ea57ff8a9bf2c7tree | snapshot
parent958ff4a5973c9858c36c405c2f593cf5172e5e1ccommit | diff
parentf0ecac2b70bf6b44b89dfa493abd2f544010b1ebcommit | 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
git clone https://git.99rst.org/PROJECT