author | Junio C Hamano <gitster@pobox.com> | |
Wed, 24 Nov 2010 20:47:18 +0000 (12:47 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Wed, 24 Nov 2010 20:47:18 +0000 (12:47 -0800) | ||
commit | a33fb40fe477fa1a9ce882230415f19378959390 | |
tree | e84d17fd700225b4e72eb17edae02783f629fa8c | tree | snapshot |
parent | 0f024aff67e6c97d0a4c797181bdd0e56724c237 | commit | diff |
parent | 3e3e1ef53285ceafd24bd88483c03a4cb604fe22 | commit | diff |
Merge branch 'jm/mailmap' into maint
* jm/mailmap:
t4203: do not let "git shortlog" DWIM based on tty
t4203 (mailmap): stop hardcoding commit ids and dates
mailmap: fix use of freed memory
* jm/mailmap:
t4203: do not let "git shortlog" DWIM based on tty
t4203 (mailmap): stop hardcoding commit ids and dates
mailmap: fix use of freed memory