![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 5 Nov 2010 18:39:07 +0000 (11:39 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 5 Nov 2010 18:39:07 +0000 (11:39 -0700) | ||
| commit | ef1e75469573e7d7356b1b23cbf08b5d26b8a9d5 | |
| tree | 2900817fe7b48ddc9243e65610e274a4a547ab9f | tree | snapshot |
| parent | 31fda6993fc5153c170bc4f356b5a2109bec87fb | commit | diff |
| parent | 3e3e1ef53285ceafd24bd88483c03a4cb604fe22 | commit | diff |
Merge branch 'jm/mailmap' into next
* 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