From 85156c22d841da4358bc3acb261f8a0a18b8989d Mon Sep 17 00:00:00 2001
From: Jonathan Nieder <jrnieder@gmail.com>
Date: Mon, 5 Apr 2010 09:12:33 -0500
Subject: [PATCH] xburst-tools: Add .mailmap for git-shortlog output

Give each patch author a single full name and working e-mail address
to keep the shortlog tidy.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
 .mailmap | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 .mailmap

diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..f2b57e6
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,9 @@
+Andy Green <andy@openmoko.com> <agreen@octopus.localdomain>
+Christopher Hall <hsw@openmoko.com> <hsw@openmoko.org>
+Marek Lindner <lindner_marek@yahoo.de>
+Wolfgang Spraul <wolfgang@qi-hardware.com>
+Zhang JieJing <kzjeef@gmail.com>
+Xiangfu Liu <xiangfu@sharism.cc> <xiangfu@qi-hardware.com>
+Xiangfu Liu <xiangfu@sharism.cc> <xiangfu.z@gmail.com>
+Xiangfu Liu <xiangfu@sharism.cc> <xiangfu@openmoko.org>
+Xiangfu Liu <xiangfu@sharism.cc> <xiangfu@xiangfu-laptop.(none)>