From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 22 Jun 2010 15:31:25 +0000 (-0700)
Subject: Merge branch 'tc/merge-m-log' into maint
X-Git-Tag: v1.7.2-rc0~7^2~13
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e3ed7f721c7bd4ecb5c98a29761ff2b2e6d38336;p=git.git

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
---

e3ed7f721c7bd4ecb5c98a29761ff2b2e6d38336