From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 5 Nov 2010 18:39:07 +0000 (-0700)
Subject: Merge branch 'jm/mailmap' into next
X-Git-Tag: ko-next~171
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ef1e75469573e7d7356b1b23cbf08b5d26b8a9d5;p=git.git

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

ef1e75469573e7d7356b1b23cbf08b5d26b8a9d5