From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 24 Nov 2010 20:47:18 +0000 (-0800)
Subject: Merge branch 'jm/mailmap' into maint
X-Git-Tag: v1.7.3.3~14
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a33fb40fe477fa1a9ce882230415f19378959390;p=git.git

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
---

a33fb40fe477fa1a9ce882230415f19378959390