Code

Merge branch 'jm/mailmap' into next
authorJunio C Hamano <gitster@pobox.com>
Fri, 5 Nov 2010 18:39:07 +0000 (11:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 5 Nov 2010 18:39:07 +0000 (11:39 -0700)
* 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


Trivial merge