From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([140.186.70.92]:43818)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <pmaydell@chiark.greenend.org.uk>) id 1RWBnK-0008LW-RJ
	for qemu-devel@nongnu.org; Thu, 01 Dec 2011 13:55:46 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <pmaydell@chiark.greenend.org.uk>) id 1RWBnH-0002Fz-6Z
	for qemu-devel@nongnu.org; Thu, 01 Dec 2011 13:55:42 -0500
Received: from chiark.greenend.org.uk ([212.13.197.229]:58571)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <pmaydell@chiark.greenend.org.uk>) id 1RWBnH-0002E9-1g
	for qemu-devel@nongnu.org; Thu, 01 Dec 2011 13:55:39 -0500
From: Peter Maydell <peter.maydell@linaro.org>
Date: Thu,  1 Dec 2011 18:55:24 +0000
Message-Id: <1322765724-24393-1-git-send-email-peter.maydell@linaro.org>
Sender: Peter Maydell <pmaydell@chiark.greenend.org.uk>
Subject: [Qemu-devel] [PATCH] Add a .mailmap to map pre-git-conversion
	authors to friendly names
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org
Cc: Anthony Liguori <aliguori@us.ibm.com>, patches@linaro.org, Blue Swirl <blauwirbel@gmail.com>, Paul Brook <paul@codesourcery.com>, "Edgar E. Iglesias" <edgar.iglesias@gmail.com>, Aurelien Jarno <aurelien@aurel32.net>

Add a .mailmap file so 'git shortlog' can map the unfriendly
pre-git-conversion author entries to real names.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
v1->v2:
 fixed Andrzej's email to match MAINTAINERS file
 added entries for Fabrice Bellard, Jocelyn Mayer
 cc'd active maintainers with an entry in the mailmap

 .mailmap |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)
 create mode 100644 .mailmap

diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..80ea514
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,16 @@
+# This mailmap just translates the weird addresses from the original import into git
+# into proper addresses so that they are counted properly in git shortlog output.
+#
+Aurelien Jarno <aurelien@aurel32.net> aurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162>
+Blue Swirl <blauwirbel@gmail.com> blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162>
+Anthony Liguori <aliguori@us.ibm.com> aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>
+Edgar E. Iglesias <edgar.iglesias@gmail.com> edgar_igl <edgar_igl@c046a42c-6fe2-441c-8c8c-71466251a162>
+malc <av1474@comtv.ru> malc <malc@c046a42c-6fe2-441c-8c8c-71466251a162>
+Paul Brook <paul@codesourcery.com> pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162>
+Andrzej Zaborowski <balrogg@gmail.com> balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162>
+Thiemo Seufer <ths@networkno.de> ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162>
+Fabrice Bellard <fabrice@bellard.org> bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>
+Jocelyn Mayer <l_indien@magic.fr> j_mayer <j_mayer@c046a42c-6fe2-441c-8c8c-71466251a162>
+# There is also a:
+#    (no author) <(no author)@c046a42c-6fe2-441c-8c8c-71466251a162>
+# for the cvs2svn initialization commit e63c3dc74bf.
-- 
1.7.1