From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 10 Jan 2013 21:46:29 +0000 (-0800)
Subject: Merge branch 'jc/maint-fmt-merge-msg-no-edit-lose-credit'
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=cf6c52fce8bf0870069b630a2e199483f8f9faac;p=git.git

Merge branch 'jc/maint-fmt-merge-msg-no-edit-lose-credit'

Stop spending cycles to compute information to be placed on
commented lines in "merge --no-edit", which will be discarded
anyway.

* jc/maint-fmt-merge-msg-no-edit-lose-credit:
  merge --no-edit: do not credit people involved in the side branch
---

cf6c52fce8bf0870069b630a2e199483f8f9faac