Merge branch 'jm/mailmap'
authorJunio C Hamano <gitster@pobox.com>
Wed, 17 Nov 2010 23:01:26 +0000 (15:01 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 17 Nov 2010 23:01:26 +0000 (15:01 -0800)
commit53b17087969cd2b81458c74692532b3764fe16c4
treefb7cb83b77f9e7776f3bb3e2ba910acd43295d8e
parentbee5e65c75d53efe00654a181542dbb5e3b5b53b
parent3e3e1ef53285ceafd24bd88483c03a4cb604fe22
Merge branch 'jm/mailmap'

* 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