diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..60170e7
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,7 @@
+<jefft0@remap.ucla.edu> <jefft0@gmail.com>
+<aa@cs.fiu.edu> <alexander.afanasyev@ucla.edu>
+<davidepesa@gmail.com> <davide.pesavento@lip6.fr>
+<enewberry@email.arizona.edu> <enewberry@cs.arizona.edu>
+Teng Liang <philoliang2011@gmail.com>
+<lybmath2009@gmail.com> <lybmath@ucla.edu>
+Hila Ben Abraham <hilata@gmail.com>