summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Ivanov <pivanov314@gmail.com>2012-06-19 12:27:53 -0700
committerPaul Ivanov <pivanov314@gmail.com>2012-06-19 14:35:49 -0700
commit082909f9ef6a544960e234946730e0a890188164 (patch)
treef60f1783614f004a4e816d1e2097e7ba8e741231
parent11836f86e0d64126d6d712c802094603b014b8e8 (diff)
added another mailmap for Ariel
now `git shortlog -sn rel/0.3...` does not cause Ariel to have split personalities.
-rw-r--r--.mailmap1
1 files changed, 1 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 121eca1..58cfa28 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,4 +1,5 @@
Ariel Rokem <arokem@berkeley.edu> arokem <arokem@berkeley.edu>
+Ariel Rokem <arokem@gmail.com> arokem <arokem@gmail.com>
Michael Waskom <mwaskom@mit.edu> mwaskom <mwaskom@mit.edu>
Mike Trumpis <mtrumpis@berkeley.edu> miketrumpis <mtrumpis@gmail.com>
Jarrod Millman <jarrod.millman@gmail.com> Jarrod Millman <millman@berkeley.edu>