summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorZhongyue Luo <zhongyue.nah@intel.com>2012-09-11 10:34:14 +0800
committerZhongyue Luo <zhongyue.nah@intel.com>2012-09-11 10:34:14 +0800
commita49c0a8e45fa56aaf989793a95c2390456238030 (patch)
tree5aa339af426d2ec8534ec552b12dfaa05ffba066 /.mailmap
parent39b74e42ecdc0ea6aaeaed88c33f6be9070b35ab (diff)
downloadneutron-a49c0a8e45fa56aaf989793a95c2390456238030.tar.gz
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
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap4
1 files changed, 4 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000000..18221d4058
--- /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>