From: Junio C Hamano Date: Mon, 14 Jan 2013 15:33:30 +0000 (-0800) Subject: Merge branch 'jc/maint-fmt-merge-msg-no-edit-lose-credit' into maint X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=bc60f9f37767f72d7ef73a4df536e199a3c13540;p=git.git Merge branch 'jc/maint-fmt-merge-msg-no-edit-lose-credit' into maint "git merge --no-edit" computed who were involved in the work done on the side branch, even though that information is to be discarded without getting seen in the editor. * jc/maint-fmt-merge-msg-no-edit-lose-credit: merge --no-edit: do not credit people involved in the side branch --- bc60f9f37767f72d7ef73a4df536e199a3c13540