Merge pull request #47 from esc/mailmap

matthew-brett · matthew-brett · commit df9129b004e1 · 2011-09-09T12:30:28.000-07:00
ENH: add mailmap file for better shortlog
diff --git a/.mailmap b/.mailmap
@@ -0,0 +1,6 @@
+Michael Hanke <michael.hanke@gmail.com>
+Michael Hanke <mhanke-guest@82381867-18eb-0310-98a2-9474e637aba2>
+Michael Hanke <michaelhanke@mvpa1.dartmouth.edu>
+Yaroslav Halchenko <debian@onerussian.com>
+Yaroslav Halchenko <yoh-guest@82381867-18eb-0310-98a2-9474e637aba2>
+Bertrand Thirion <bertrand.thirion@inria.fr> bthirion <bertrand.thirion@inria.fr>

-Original file line number
+Diff line change
@@ @@ -0,0 +1,6 @@ @@
 +Michael Hanke <[email protected]>
 +Michael Hanke <mhanke-guest@82381867-18eb-0310-98a2-9474e637aba2>
 +Michael Hanke <[email protected]>
 +Yaroslav Halchenko <[email protected]>
 +Yaroslav Halchenko <yoh-guest@82381867-18eb-0310-98a2-9474e637aba2>
 +Bertrand Thirion <[email protected]> bthirion <[email protected]>