diff --git a/.mailmap b/.mailmap
new file mode 100644
index 00000000..66e8aae0
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,4 @@
+# Format is:
+# <preferred e-mail> <other e-mail 1>
+# <preferred e-mail> <other e-mail 2>
+<guoyingc@cn.ibm.com> <daisy.ycguo@gmail.com>