fix: update mailmap to fix contributor aliases

satra · satra · commit 9d775a07e2a0 · 2017-05-13T14:37:11.000-04:00
diff --git a/.mailmap b/.mailmap
@@ -1,11 +1,97 @@
+Aimi Watanabe <watanabe.aimi@gmail.com> stymy <rschadmin@cmi-rsch-li002.childmind.org>
+Aimi Watanabe <watanabe.aimi@gmail.com> stymy <watanabe.aimi@gmail.com>
+Alexander Schaefer <alexschaefer83@gmail.com> Alexander Schaefer <aschaefer@melisse.cbs.mpg.de>
+Alexander Schaefer <alexschaefer83@gmail.com> alexschaefer83 <alexschaefer83@gmail.com>
+Alexander Schaefer <alexschaefer83@gmail.com> aschaefer <aschaefer@aschaefer-U36SD.(none)>
+Alexandre M. Savio <alexsavio@gmail.com> Alexandre M. S <alexsavio@gmail.com>
+Alexandre M. Savio <alexsavio@gmail.com> Alexandre M. S <alexsavio@users.noreply.github.com>
+Alexandre M. Savio <alexsavio@gmail.com> Alexandre Manhaes Savio <alexsavio@gmail.com>
+Anisha Keshavan <akeshavan@gmail.com> Anisha Keshavan <akeshavan@ucla.edu>
+Anisha Keshavan <akeshavan@gmail.com> akeshavan <keshavan@berkeley.edu>
 Ariel Rokem <arokem@berkeley.edu> arokem <arokem@berkeley.edu>
-Cindee Madison <cindee@berkeley.edu> cindeem <>
-Cindee Madison <cindee@berkeley.edu> cindeem
-Chris Filo Gorgolewski <chris.gorgolewski@gmail.com> filo <filo@filo-Precision-M6500>
+Ariel Rokem <arokem@berkeley.edu> arokem <arokem@gmail.com>
+Arman Eshaghi <arman.eshaghi@gmail.com> armaneshaghi <arman.eshaghi@gmail.com>
+Ashely Gillman <gillmanash@gmail.com> Ashley Gillman <ashley.gillman@csiro.au>
+Ashely Gillman <gillmanash@gmail.com> ashgillman <ashley.gillman@csiro.au>
+Basille Pinsard <basile.pinsard@umontreal.ca> bpinsard <basile.pinsard@umontreal.ca>
+Basille Pinsard <basile.pinsard@umontreal.ca> bpinsard <bpinsard@imed.jussieu.fr>
+Ben Cipollini <bcipollini@classy.org> Ben Cipollini <bcipolli@ucsd.edu>
+Benjamin Yvernault <byvernault@gmail.com> Benjamin Yvernault <mathieusaboye@MBP-de-Mathieu.fritz.box>
+Benjamin Yvernault <byvernault@gmail.com> byvernault <byvernault@gmail.com>
+Blake Dewey <blake.dewey@jhu.edu> Blake Dewey <blake.dewey@nih.gov>
+Blake Dewey <blake.dewey@jhu.edu> blakedewey <deweybe@ndsl-nib-bdewey.local>
+Blake Dewey <blake.dewey@jhu.edu> blakedewey <deweybe@ndsl-nib-bdewey.ninds.nih.gov>
+Brendan Moloney <moloney.brendan@gmail.com> moloney <moloney.brendan@gmail.com>
+Chris Filo Gorgolewski <chris.gorgolewski@gmail.com> Chris Filo Gorgolewski <filo@filo-Precision-M6500.(none)>
+Chris Filo Gorgolewski <chris.gorgolewski@gmail.com> Chris Filo Gorgolewski <krzysztof.gorgolewski+fake@gmail.com>
+Chris Filo Gorgolewski <chris.gorgolewski@gmail.com> Chris Filo Gorgolewski <krzysztof.gorgolewski@gmail.com>
+Chris Filo Gorgolewski <chris.gorgolewski@gmail.com> Chris Gorgolewski <krzysztof.gorgolewski@gmail.com>
 Chris Filo Gorgolewski <chris.gorgolewski@gmail.com> Krzysztof Gorgolewski <krzysztof.gorgolewski@gmail.com>
-Erik Ziegler <erik.ziegler@ulg.ac.be> erikz <erik.ziegler@ulg.ac.be>
-Michael Waskom <mwaskom@stanford.edu> mwaskom <mwaskom@stanford.edu> Michael Waskom <mwaskom@mit.edu> mwaskom <mwaskom@mit.edu>
+Chris Filo Gorgolewski <chris.gorgolewski@gmail.com> filo <filo@filo-Precision-M6500>
+Chris Filo Gorgolewski <chris.gorgolewski@gmail.com> filo <filo@filo-dtc-laptop>
+Chris Filo Gorgolewski <chris.gorgolewski@gmail.com> filo <filo@filolaptop>
+Christopher J. Markiewicz <effigies@gmail.com> Chris Markiewicz <effigies@gmail.com>
+Christopher J. Markiewicz <effigies@gmail.com> Christopher J. Johnson <effigies@gmail.com>
+Christopher J. Markiewicz <effigies@gmail.com> Christopher J. Markiewicz <effigies@bu.edu>
+Christopher J. Markiewicz <effigies@gmail.com> Christopher J. Markiewicz <markiewicz@stanford.edu>
+Cindee Madison <cindee@berkeley.edu> cindeem
+Cindee Madison <cindee@berkeley.edu> cindeem <>
+Colin Buchanan <colinrbuchanan@gmail.com> Colin Buchanan <cbuchanan@cray4.(none)>
+Colin Buchanan <colinrbuchanan@gmail.com> colinbuchanan <colinrbuchanan@gmail.com>
+Daniel Clark <danieljclark87@gmail.com> dclark87 <danieljclark87@gmail.com>
+Daniel Ginsburg <daniel.ginsburg@childrens.harvard.edu> danginsburg <daniel.ginsburg@childrens.harvard.edu>
+David Ellis <dgellis90@gmail.com> David Ellis <david-ellis@uiowa.edu>
+David Ellis <dgellis90@gmail.com> David Ellis <david.ellis@unmc.edu>
+David Welch <david.m.welch@gmail.com> David Welch <dmwelch@users.noreply.github.com>
+Dmytro <belevtsoff@gmail.com> belevtsoff <belevtsoff@gmail.com>
+Erik Ziegler <erik.sweed@gmail.com> Erik <erik.ziegler@ulg.ac.be>
+Erik Ziegler <erik.sweed@gmail.com> Erik Ziegler <erik.ziegler@ulg.ac.be>
+Erik Ziegler <erik.sweed@gmail.com> erik <erik@erik-ubuntu.(none)>
+Erik Ziegler <erik.sweed@gmail.com> erikz <erik.ziegler@ulg.ac.be>
+Erik Ziegler <erik.sweed@gmail.com> swederik <erik.sweed@gmail.com>
 Gael Varoquaux <gael.varoquaux@normalesup.org> GaelVaroquaux
 Gael Varoquaux <gael.varoquaux@normalesup.org> GaelVaroquaux <gael.varoquaux@noramlesup.org>
-Daniel Ginsburg <daniel.ginsburg@childrens.harvard.edu> danginsburg <daniel.ginsburg@childrens.harvard.edu>
-Colin Buchanan <colinrbuchanan@gmail.com> colinbuchanan <colinrbuchanan@gmail.com>
+Gavin Cooper <Gavin.Cooper@newcastle.edu.au> gjcooper <gjcooper@gmail.com>
+Hans Johnson <hans-johnson@uiowa.edu> Hans Johnson <hans.j.johnson@gmail.com>
+Hans Johnson <hans-johnson@uiowa.edu> hjmjohnson <hans.j.johnson@gmail.com>
+Horea Christian <horea.christ@yandex.com> Horea Christian <h.chr@mail.ru>
+James Kent <james-kent@uiowa.edu> jdkent <james-kent@uiowa.edu>
+Jason <jf126dolphin@gmail.com> jason <jf126dolphin@gmail.com>
+Jason W <jf126dolphin@gmail.com> Jason <jf126dolphin@gmail.com>
+Jason W <jf126dolphin@gmail.com> Jason W <jasonwong73@ucla.edu>
+Jason W <jf126dolphin@gmail.com> jason-wg <jf126dolphin@gmail.com>
+Jessica Forbes <jessica-forbes@uiowa.edu> jessicaforbes <jessica-forbes@uiowa.edu>
+Joerg Stadler <Joerg.Stadler@lin-magdeburg.de> Joerg Stadler <joerg.stadler@lin-magdeburg.de>
+Joerg Stadler <Joerg.Stadler@lin-magdeburg.de> Jörg Stadler <Stadler@lin-magdeburg.de>
+Joke Durnez <joke.durnez@gmail.com> jokedurnez <joke.durnez@gmail.com>
+Josh Warner <silvertrumpet999+github@gmail.com> Josh Warner (Mac) <warner.joshua@mayo.edu>
+Leonie Lampe <leonie.lampe@gmail.com> Leonie Lmape <leonie.lampe@gmail.com>
+Mathias Goncalves <goncalves.mathias@gmail.com> mathiasg <mathiasg@mit.edu>
+Michael <mdayan.research@gmail.com> Michael <mdayan.comp@gmail.com>
+Michael <mdayan.research@gmail.com> mick-d <mid2021@CHUCK.(none)>
+Michael Clark <michael.clark195@gmail.com> Clark <clarkmg@nih.gov>
+Michael Notter <michaelnotter@hotmail.com> miykael <michaelnotter@hotmail.com>
+Michael Waskom <michael.l.waskom@gmail.com> Michael Waskom <mwaskom@mit.edu>
+Michael Waskom <michael.l.waskom@gmail.com> Michael Waskom <mwaskom@stanford.edu>
+Michael Waskom <michael.l.waskom@gmail.com> mwaskom <mwaskom@mit.edu>
+Michael Waskom <michael.l.waskom@gmail.com> mwaskom <mwaskom@stanford.edu>
+Oscar Esteban <code@oscaresteban.es> Oscar Esteban <code@oscaresteban>
+Oscar Esteban <code@oscaresteban.es> oesteban <code@oscaresteban.es>
+Russell Poldrack <poldrack@gmail.com> Russ Poldrack <poldrack@gmail.com>
+Russell Poldrack <poldrack@gmail.com> poldrack <poldrack@gmail.com>
+Satrajit Ghosh <satrajit.ghosh@gmail.com> Satrajit Ghosh <satra@mit.edu>
+Shoshana Berleant <berleant@stanford.edu> Shoshana Berleant <nope>
+Shoshana Berleant <berleant@stanford.edu> Shoshana Berleant <shoshber@users.noreply.github.com>
+Simon R <srothmei@mailbox.tu-berlin.de> Simon Rothmeier <srothmei@users.noreply.github.com>
+Siqi Liu <lsqshr@gmail.com> siqi liu <lsqshr@gmail.com>
+Siqi Liu <lsqshr@gmail.com> sql <lsqshr@gmail.com>
+Steven Giavasis <sgiava77@gmail.com> Steven Giavasis <steven.giavasis@cmi-rsch-li001.childmind.org>
+Steven Giavasis <sgiava77@gmail.com> sgiavasis <sgiava77@gmail.com>
+Steven Giavasis <sgiava77@gmail.com> sgiavasis <sgiavasis@ieee.org>
+Tristan Glatard <tristan.glatard@mcgill.ca> Tristan Glatard <tristan.glatard@creatis.insa-lyon.fr>
+Victor Saase <victor@saase.net> vsaase <victor@saase.net>
+William Triplett <wtriplett@gmail.com> William Triplett <wtriplett@ufl.edu>
+Yaroslav Halchenko <debian@onerussian.com> Yaroslav Halchenko <yoh@dartmouth.edu>
+fliem <franz.liem@gmail.com> fliem <franz.liem>
+pipolose <pipolose@pipoloses-air.watson.ibm.com> pipolose <pipolose@pipoloses-MacBook-Air.local>
+shariqiqbal2810 <shariqiqbal2810@gmail.com> shariqiqbal2810 <shariqiqbal2810@users.noreply.github.com>

-Original file line number
+Diff line change
@@ @@ -1,11 +1,97 @@ @@
 +Aimi Watanabe <[email protected]> stymy <[email protected]>
 +Aimi Watanabe <[email protected]> stymy <[email protected]>
 +Alexander Schaefer <[email protected]> Alexander Schaefer <[email protected]>
 +Alexander Schaefer <[email protected]> alexschaefer83 <[email protected]>
 +Alexander Schaefer <[email protected]> aschaefer <aschaefer@aschaefer-U36SD.(none)>
 +Alexandre M. Savio <[email protected]> Alexandre M. S <[email protected]>
 +Alexandre M. Savio <[email protected]> Alexandre M. S <[email protected]>
 +Alexandre M. Savio <[email protected]> Alexandre Manhaes Savio <[email protected]>
 +Anisha Keshavan <[email protected]> Anisha Keshavan <[email protected]>
 +Anisha Keshavan <[email protected]> akeshavan <[email protected]>
 Ariel Rokem <[email protected]> arokem <[email protected]>
 -Cindee Madison <[email protected]> cindeem <>
 -Cindee Madison <[email protected]> cindeem
 -Chris Filo Gorgolewski <[email protected]> filo <filo@filo-Precision-M6500>
 +Ariel Rokem <[email protected]> arokem <[email protected]>
 +Arman Eshaghi <[email protected]> armaneshaghi <[email protected]>
 +Ashely Gillman <[email protected]> Ashley Gillman <[email protected]>
 +Ashely Gillman <[email protected]> ashgillman <[email protected]>
 +Basille Pinsard <[email protected]> bpinsard <[email protected]>
 +Basille Pinsard <[email protected]> bpinsard <[email protected]>
 +Ben Cipollini <[email protected]> Ben Cipollini <[email protected]>
 +Benjamin Yvernault <[email protected]> Benjamin Yvernault <[email protected]>
 +Benjamin Yvernault <[email protected]> byvernault <[email protected]>
 +Blake Dewey <[email protected]> Blake Dewey <[email protected]>
 +Blake Dewey <[email protected]> blakedewey <[email protected]>
 +Blake Dewey <[email protected]> blakedewey <[email protected]>
 +Brendan Moloney <[email protected]> moloney <[email protected]>
 +Chris Filo Gorgolewski <[email protected]> Chris Filo Gorgolewski <filo@filo-Precision-M6500.(none)>
 +Chris Filo Gorgolewski <[email protected]> Chris Filo Gorgolewski <[email protected]>
 +Chris Filo Gorgolewski <[email protected]> Chris Filo Gorgolewski <[email protected]>
 +Chris Filo Gorgolewski <[email protected]> Chris Gorgolewski <[email protected]>
 Chris Filo Gorgolewski <[email protected]> Krzysztof Gorgolewski <[email protected]>
 -Erik Ziegler <[email protected]> erikz <[email protected]>
 -Michael Waskom <[email protected]> mwaskom <[email protected]> Michael Waskom <[email protected]> mwaskom <[email protected]>
 +Chris Filo Gorgolewski <[email protected]> filo <filo@filo-Precision-M6500>
 +Chris Filo Gorgolewski <[email protected]> filo <filo@filo-dtc-laptop>
 +Chris Filo Gorgolewski <[email protected]> filo <filo@filolaptop>
 +Christopher J. Markiewicz <[email protected]> Chris Markiewicz <[email protected]>
 +Christopher J. Markiewicz <[email protected]> Christopher J. Johnson <[email protected]>
 +Christopher J. Markiewicz <[email protected]> Christopher J. Markiewicz <[email protected]>
 +Christopher J. Markiewicz <[email protected]> Christopher J. Markiewicz <[email protected]>
 +Cindee Madison <[email protected]> cindeem
 +Cindee Madison <[email protected]> cindeem <>
 +Colin Buchanan <[email protected]> Colin Buchanan <cbuchanan@cray4.(none)>
 +Colin Buchanan <[email protected]> colinbuchanan <[email protected]>
 +Daniel Clark <[email protected]> dclark87 <[email protected]>
 +Daniel Ginsburg <[email protected]> danginsburg <[email protected]>
 +David Ellis <[email protected]> David Ellis <[email protected]>
 +David Ellis <[email protected]> David Ellis <[email protected]>
 +David Welch <[email protected]> David Welch <[email protected]>
 +Dmytro <[email protected]> belevtsoff <[email protected]>
 +Erik Ziegler <[email protected]> Erik <[email protected]>
 +Erik Ziegler <[email protected]> Erik Ziegler <[email protected]>
 +Erik Ziegler <[email protected]> erik <erik@erik-ubuntu.(none)>
 +Erik Ziegler <[email protected]> erikz <[email protected]>
 +Erik Ziegler <[email protected]> swederik <[email protected]>
 Gael Varoquaux <[email protected]> GaelVaroquaux
 Gael Varoquaux <[email protected]> GaelVaroquaux <[email protected]>
 -Daniel Ginsburg <[email protected]> danginsburg <[email protected]>
 -Colin Buchanan <[email protected]> colinbuchanan <[email protected]>
 +Gavin Cooper <[email protected]> gjcooper <[email protected]>
 +Hans Johnson <[email protected]> Hans Johnson <[email protected]>
 +Hans Johnson <[email protected]> hjmjohnson <[email protected]>
 +Horea Christian <[email protected]> Horea Christian <[email protected]>
 +James Kent <[email protected]> jdkent <[email protected]>
 +Jason <[email protected]> jason <[email protected]>
 +Jason W <[email protected]> Jason <[email protected]>
 +Jason W <[email protected]> Jason W <[email protected]>
 +Jason W <[email protected]> jason-wg <[email protected]>
 +Jessica Forbes <[email protected]> jessicaforbes <[email protected]>
 +Joerg Stadler <[email protected]> Joerg Stadler <[email protected]>
 +Joerg Stadler <[email protected]> Jörg Stadler <[email protected]>
 +Joke Durnez <[email protected]> jokedurnez <[email protected]>
 +Josh Warner <[email protected]> Josh Warner (Mac) <[email protected]>
 +Leonie Lampe <[email protected]> Leonie Lmape <[email protected]>
 +Mathias Goncalves <[email protected]> mathiasg <[email protected]>
 +Michael <[email protected]> Michael <[email protected]>
 +Michael <[email protected]> mick-d <mid2021@CHUCK.(none)>
 +Michael Clark <[email protected]> Clark <[email protected]>
 +Michael Notter <[email protected]> miykael <[email protected]>
 +Michael Waskom <[email protected]> Michael Waskom <[email protected]>
 +Michael Waskom <[email protected]> Michael Waskom <[email protected]>
 +Michael Waskom <[email protected]> mwaskom <[email protected]>
 +Michael Waskom <[email protected]> mwaskom <[email protected]>
 +Oscar Esteban <[email protected]> Oscar Esteban <code@oscaresteban>
 +Oscar Esteban <[email protected]> oesteban <[email protected]>
 +Russell Poldrack <[email protected]> Russ Poldrack <[email protected]>
 +Russell Poldrack <[email protected]> poldrack <[email protected]>
 +Satrajit Ghosh <[email protected]> Satrajit Ghosh <[email protected]>
 +Shoshana Berleant <[email protected]> Shoshana Berleant <nope>
 +Shoshana Berleant <[email protected]> Shoshana Berleant <[email protected]>
 +Simon R <[email protected]> Simon Rothmeier <[email protected]>
 +Siqi Liu <[email protected]> siqi liu <[email protected]>
 +Siqi Liu <[email protected]> sql <[email protected]>
 +Steven Giavasis <[email protected]> Steven Giavasis <[email protected]>
 +Steven Giavasis <[email protected]> sgiavasis <[email protected]>
 +Steven Giavasis <[email protected]> sgiavasis <[email protected]>
 +Tristan Glatard <[email protected]> Tristan Glatard <[email protected]>
 +Victor Saase <[email protected]> vsaase <[email protected]>
 +William Triplett <[email protected]> William Triplett <[email protected]>
 +Yaroslav Halchenko <[email protected]> Yaroslav Halchenko <[email protected]>
 +fliem <[email protected]> fliem <franz.liem>
 +pipolose <[email protected]> pipolose <[email protected]>
 +shariqiqbal2810 <[email protected]> shariqiqbal2810 <[email protected]>