added .mailmap

ivanov · ivanov · commit fa2a019298b6 · 2011-09-23T23:54:38.000-07:00
Now each committer has only one entry in shortlog
$ git shortlog -sn
  2094	John Hunter &lt;jdh2358@gmail.com&gt;
  1678	Michael Droettboom &lt;mdboom@gmail.com&gt;
   916	Eric Firing &lt;efiring@hawaii.edu&gt;
   432	Darren Dale &lt;dsdale24@gmail.com&gt;
   355	Jae-Joon Lee &lt;lee.j.joon@gmail.com&gt;
   272	Andrew Straw &lt;strawman@astraw.com&gt;
   263	Steve Chaplin &lt;stevech1097@yahoo.com.au&gt;
   194	Jouni K. Seppänen &lt;jks@iki.fi&gt;
   149	Charles Moad &lt;cwmoad@gmail.com&gt;
   146	Ryan May &lt;rmay31@gmail.com&gt;
   124	Ben Root &lt;ben.v.root@gmail.com&gt;
    59	Jeff Whitaker &lt;jswhit@fastmail.fm&gt;
    53	Manuel Metz &lt;manuel.metz@googlemail.com&gt;
    48	Norbert Nemec &lt;Norbert@Nemec-online.de&gt;
    45	James Evans &lt;jrevans1@earthlink.net&gt;
    42	pkienzle &lt;pkienzle@localhost&gt;
    42	Todd Miller &lt;jmiller@stsci.edu&gt;
    29	Paul Barret &lt;pebarret@gmail.com&gt;
    25	Michiel de Hoon &lt;mjldehoon@yahoo.com&gt;
    23	Jochen Voss &lt;voss@seehuhn.de&gt;
diff --git a/.mailmap b/.mailmap
@@ -0,0 +1,7 @@
+John Hunter <jdh2358@gmail.com> jdh2358 <jdh2358@gmail.com>
+Michael Droettboom <mdboom@gmail.com> Michael Droettboom <mdroe@stsci.edu>
+Jouni K. Seppänen <jks@iki.fi> Jouni K. Seppänen <jks@iki.fi>
+Ben Root <ben.v.root@gmail.com> Benjamin Root <ben.v.root@gmail.com>
+Michiel de Hoon <mjldehoon@yahoo.com> Michiel de Hoon <mdehoon@michiel-de-hoons-computer.local>
+Kevin Davies <kdavies4@gmail.com> Kevin Davies <daviesk24@yahoo.com>
+Christoph Gohlke <cgohlke@uci.edu> cgohlke <cgohlke@uci.edu>

-Original file line number
+Diff line change
@@ @@ -0,0 +1,7 @@ @@
 +John Hunter <[email protected]> jdh2358 <[email protected]>
 +Michael Droettboom <[email protected]> Michael Droettboom <[email protected]>
 +Jouni K. Seppänen <[email protected]> Jouni K. Seppänen <[email protected]>
 +Ben Root <[email protected]> Benjamin Root <[email protected]>
 +Michiel de Hoon <[email protected]> Michiel de Hoon <[email protected]>
 +Kevin Davies <[email protected]> Kevin Davies <[email protected]>
 +Christoph Gohlke <[email protected]> cgohlke <[email protected]>