diff --git a/.mailmap b/.mailmap
new file mode 100644
index 00000000000..3f53300caa4
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1 @@
+Eric Amodio <eamodio@microsoft.com> Eric Amodio <eamodio@gmail.com>