| commit | bc60f9f37767f72d7ef73a4df536e199a3c13540 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 14 Jan 2013 15:33:30 +0000 (14 07:33 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 14 Jan 2013 15:33:30 +0000 (14 07:33 -0800) | ||
| tree | 3ec249750110e61bb1ce802fc361fe5151cbf7fd | treesnapshot (tar.gz zip) |
| parent | 7842c44ccb89dc6c88e67bcc559bc9b38c617e0c | commitdiff |
| parent | 9bcbb1c218d075d8b180cfef4c9089f868151e7e | commitdiff |
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
"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 | blobhistory |
| builtin/fmt-merge-msg.c | diff1 | diff2 | blobhistory |
| builtin/merge.c | diff1 | diff2 | blobhistory |