ENH - learning Zen of .mailmap

yarikoptic · yarikoptic · commit 9218ed7d8759 · 2011-12-09T11:22:43.000-05:00
made it shorter and more up to the format, if before
$&gt; git log --pretty=format:'%aN &lt;%aE&gt;' | sort | uniq
Alexandre Gramfort &lt;alexandre.gramfort@inria.fr&gt;
Bertrand Thirion &lt;bertrand.thirion@inria.fr&gt;
Christopher Burns &lt;cburns@berkeley.edu&gt;
Ian Nimmo-Smith &lt;ian.nimmo-smith@mrc-cbu.cam.ac.uk&gt;
Jarrod Millman &lt;jarrod.millman@gmail.com&gt;
Matthew Brett &lt;matthew.brett@gmail.com&gt;
Michael Hanke &lt;mhanke-guest@82381867-18eb-0310-98a2-9474e637aba2&gt;
Michael Hanke &lt;michael.hanke@gmail.com&gt;
Michael Hanke &lt;michaelhanke@mvpa1.dartmouth.edu&gt;
Stephan Gerhard &lt;git@github.com&gt;
Stephan Gerhard &lt;git@unidesign.ch&gt;
Thomas Ballinger &lt;thomas@thomas-laptop.(none)&gt;
Valentin Haenel &lt;valentin.haenel@gmx.de&gt;
Yaroslav Halchenko &lt;debian@onerussian.com&gt;
Yaroslav Halchenko &lt;yoh-guest@82381867-18eb-0310-98a2-9474e637aba2&gt;

now

$&gt; git log --pretty=format:'%aN &lt;%aE&gt;' | sort | uniq
Alexandre Gramfort &lt;alexandre.gramfort@inria.fr&gt;
Bertrand Thirion &lt;bertrand.thirion@inria.fr&gt;
Christopher Burns &lt;cburns@berkeley.edu&gt;
Ian Nimmo-Smith &lt;ian.nimmo-smith@mrc-cbu.cam.ac.uk&gt;
Jarrod Millman &lt;jarrod.millman@gmail.com&gt;
Matthew Brett &lt;matthew.brett@gmail.com&gt;
Michael Hanke &lt;michael.hanke@gmail.com&gt;
Stephan Gerhard &lt;git@unidesign.ch&gt;
Thomas Ballinger &lt;thomas@thomas-laptop.(none)&gt;
Valentin Haenel &lt;valentin.haenel@gmx.de&gt;
Yaroslav Halchenko &lt;debian@onerussian.com&gt;

;-)
diff --git a/.mailmap b/.mailmap
@@ -1,6 +1,5 @@
-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>
+Michael Hanke <michael.hanke@gmail.com> <mhanke-guest@82381867-18eb-0310-98a2-9474e637aba2>
+Michael Hanke <michael.hanke@gmail.com> <michaelhanke@mvpa1.dartmouth.edu>
+Yaroslav Halchenko <debian@onerussian.com> <yoh-guest@82381867-18eb-0310-98a2-9474e637aba2>
 Bertrand Thirion <bertrand.thirion@inria.fr> bthirion <bertrand.thirion@inria.fr>
+Stephan Gerhard <git@unidesign.ch> Stephan Gerhard <git@github.com>

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