diff --git a/.mailmap b/.mailmap
new file mode 100644
index 000000000..0110f4597
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1 @@
+Amy Grinn <grinn.amy@gmail.com> Tyler Grinn <tylergrinn@gmail.com>