projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 44fe835 9bcbb1c)
Merge branch 'jc/maint-fmt-merge-msg-no-edit-lose-credit'
authorJunio C Hamano <gitster@pobox.com>
Thu, 10 Jan 2013 21:46:29 +0000 (13:46 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 Jan 2013 21:46:29 +0000 (13:46 -0800)
commitcf6c52fce8bf0870069b630a2e199483f8f9faac
tree99a52b465c95f4a85316772425cf8ce173125b18tree | snapshot
parent44fe83502edf5391bb3a5997cab01794b4568062commit | diff
parent9bcbb1c218d075d8b180cfef4c9089f868151e7ecommit | diff
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
builtin.h diff1 | diff2 | blob | history
builtin/fmt-merge-msg.c diff1 | diff2 | blob | history
builtin/merge.c diff1 | diff2 | blob | history
Git—the stupid content tracker