diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000000..6119dc7313
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,3 @@
+Willow Chargin <wchargin@gmail.com>
+Willow Chargin <wchargin@gmail.com> <github@wchargin.com>
+Willow Chargin <wchargin@gmail.com> <wchargin@google.com>