Adjust .mailmap to account for mapping various folks with multiple emails so that git shortlog -sn -e provides entries without duplicates

yarikoptic · yarikoptic · commit a4ffea65a4a5 · 2023-05-05T19:20:25.000-04:00
Somewhat more info at nipy/heudiconv-joss-paper#18
diff --git a/.mailmap b/.mailmap
@@ -1,20 +1,26 @@
-
 Basile Pinsard <basile.pinsard@gmail.com>
 Chris Filo Gorgolewski <krzysztof.gorgolewski@gmail.com> Chris Gorgolewski <krzysztof.gorgolewski@gmail.com>
 Christopher J. Markiewicz <markiewicz@stanford.edu>
-Dae Houlihan <daeda@mit.edu>
-Dae Houlihan <daeh@users.noreply.github.com>
+Dae Houlihan <daeda@mit.edu> Dae <daeh@users.noreply.github.com>
+Isaac To <candleindark@gmail.com> Isaac To <candleindark@users.noreply.github.com>
 John Lee <johnleenimh@gmail.com>
-John Lee <leej3@users.noreply.github.com>
-Mathias Goncalves <goncalves.mathias@gmail.com>
-Mathias Goncalves <goncalves.mathias@gmail.com> <mathiasg@mit.edu>
-Mathias Goncalves <mathiasg@stanford.edu>
-Matteo Visconti di Oleggio Castello <matteo.visconti.gr@dartmouth.edu>
-Matteo Visconti di Oleggio Castello <mvdoc.gr@dartmouth.edu>
-Matteo Visconti di Oleggio Castello <mvdoc@users.noreply.github.com>
-Michael Dayan <79224807+neurorepro@users.noreply.github.com>
-Michael Dayan <michael.dayan@fcbg.ch>
-Michael Krause <krause@mpib-berlin.mpg.de>
-Michael Krause <mk@galax.is>
-Pablo Velasco <pablovelasco@flywheel.io>
-Pablo Velasco <pablo.velasco@nyu.edu>
+John Lee <johnleenimh@gmail.com> <leej3@users.noreply.github.com>
+John T. Wodder II <git@varonathe.org> <jwodder@users.noreply.github.com>
+Jörg Stadler <joerg.stadler@lin-magdeburg.de> Joerg Stadler <joerg.stadler@lin-magdeburg.de>
+Jörg Stadler <joerg.stadler@lin-magdeburg.de> Joerg Stadler <jstadler@lin-magdeburg.de>
+Jörg Stadler <joerg.stadler@lin-magdeburg.de> Jörg Stadler <jstadler@lin-magdeburg.de>
+Jörg Stadler <joerg.stadler@lin-magdeburg.de> Jörg Stadler <Stadler@lin-magdeburg.de>
+Mathias Goncalves <goncalves.mathias@gmail.com> mathiasg <mathiasg@mit.edu>
+Mathias Goncalves <goncalves.mathias@gmail.com> mathiasg <mathiasg@stanford.edu>
+Mathias Goncalves <goncalves.mathias@gmail.com> Mathias Goncalves <mathiasg@mit.edu>
+Mathias Goncalves <goncalves.mathias@gmail.com> Mathias Goncalves <mathiasg@stanford.edu>
+Matteo Visconti di Oleggio Castello <matteo.visconti.gr@dartmouth.edu> Matteo Visconti dOC <matteo.visconti.gr@dartmouth.edu>
+Matteo Visconti di Oleggio Castello <matteo.visconti.gr@dartmouth.edu> Matteo Visconti dOC <mvdoc.gr@dartmouth.edu>
+Matteo Visconti di Oleggio Castello <matteo.visconti.gr@dartmouth.edu> <mvdoc@users.noreply.github.com>
+Michael Dayan <michael.dayan@fcbg.ch> <79224807+neurorepro@users.noreply.github.com>
+Michael Krause <krause@mpib-berlin.mpg.de> <mk@galax.is>
+Pablo Velasco <pablo.velasco@nyu.edu> <pablovelasco@flywheel.io>
+Pablo Velasco <pablo.velasco@nyu.edu> pvelasco <pablo.velasco@nyu.edu>
+Satrajit Ghosh <satrajit.ghosh@gmail.com> Satrajit Ghosh <satra@mit.edu>
+Steven Tilley <steve@steventilley.com> Steven Tilley <stilley2@jhmi.edu>
+Steven Tilley <steve@steventilley.com> Steven Tilley <stilley2@localhost.localdomain>

-Original file line number
+Diff line change
@@ @@ -1,20 +1,26 @@ @@
+-
 Basile Pinsard <[email protected]>
 Chris Filo Gorgolewski <[email protected]> Chris Gorgolewski <[email protected]>
 Christopher J. Markiewicz <[email protected]>
 -Dae Houlihan <[email protected]>
 -Dae Houlihan <daeh@users.noreply.github.com>
 +Dae Houlihan <[email protected]> Dae <[email protected]>
 +Isaac To <[email protected]> Isaac To <candleindark@users.noreply.github.com>
 John Lee <[email protected]>
 -John Lee <[email protected]>
 -Mathias Goncalves <[email protected]>
 -Mathias Goncalves <[email protected]> <[email protected]>
 -Mathias Goncalves <[email protected]>
 -Matteo Visconti di Oleggio Castello <[email protected]>
 -Matteo Visconti di Oleggio Castello <[email protected]>
 -Matteo Visconti di Oleggio Castello <[email protected]>
 -Michael Dayan <[email protected]>
 -Michael Dayan <[email protected]>
 -Michael Krause <[email protected]>
 -Michael Krause <[email protected]>
 -Pablo Velasco <[email protected]>
 -Pablo Velasco <[email protected]>
 +John Lee <[email protected]> <[email protected]>
 +John T. Wodder II <[email protected]> <[email protected]>
 +Jörg Stadler <[email protected]> Joerg Stadler <[email protected]>
 +Jörg Stadler <[email protected]> Joerg Stadler <[email protected]>
 +Jörg Stadler <[email protected]> Jörg Stadler <[email protected]>
 +Jörg Stadler <[email protected]> Jörg Stadler <[email protected]>
 +Mathias Goncalves <[email protected]> mathiasg <[email protected]>
 +Mathias Goncalves <[email protected]> mathiasg <[email protected]>
 +Mathias Goncalves <[email protected]> Mathias Goncalves <[email protected]>
 +Mathias Goncalves <[email protected]> Mathias Goncalves <[email protected]>
 +Matteo Visconti di Oleggio Castello <[email protected]> Matteo Visconti dOC <[email protected]>
 +Matteo Visconti di Oleggio Castello <[email protected]> Matteo Visconti dOC <[email protected]>
 +Matteo Visconti di Oleggio Castello <[email protected]> <[email protected]>
 +Michael Dayan <[email protected]> <[email protected]>
 +Michael Krause <[email protected]> <[email protected]>
 +Pablo Velasco <[email protected]> <[email protected]>
 +Pablo Velasco <[email protected]> pvelasco <[email protected]>
 +Satrajit Ghosh <[email protected]> Satrajit Ghosh <[email protected]>
 +Steven Tilley <[email protected]> Steven Tilley <[email protected]>
 +Steven Tilley <[email protected]> Steven Tilley <[email protected]>