projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7842c44 9bcbb1c)
Merge branch 'jc/maint-fmt-merge-msg-no-edit-lose-credit' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 14 Jan 2013 15:33:30 +0000 (07:33 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 14 Jan 2013 15:33:30 +0000 (07:33 -0800)
commitbc60f9f37767f72d7ef73a4df536e199a3c13540
tree3ec249750110e61bb1ce802fc361fe5151cbf7fdtree | snapshot
parent7842c44ccb89dc6c88e67bcc559bc9b38c617e0ccommit | diff
parent9bcbb1c218d075d8b180cfef4c9089f868151e7ecommit | diff
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
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