From: Zhongyue Luo <zhongyue.nah@intel.com>
Date: Tue, 11 Sep 2012 02:34:14 +0000 (+0800)
Subject: Create .mailmap file
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=a49c0a8e45fa56aaf989793a95c2390456238030;p=openstack-build%2Fneutron-build.git

Create .mailmap file

Fixes bug #1048903

Use .mailmap file to coalesce commits
by the same person using multiple names and/or email addresses

Change-Id: Ib702114da944ec9d117ab969cde0b29a89999467
---

diff --git a/.mailmap b/.mailmap
new file mode 100644
index 000000000..18221d405
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,4 @@
+# Format is:
+# <preferred e-mail> <other e-mail 1>
+# <preferred e-mail> <other e-mail 2>
+Zhongyue Luo <zhongyue.nah@intel.com> <lzyeval@gmail.com>