MNT: Sort .mailmap

effigies · effigies · commit ee273d3c379b · 2019-02-28T21:51:05.000-05:00
diff --git a/.mailmap b/.mailmap
@@ -7,48 +7,48 @@
 #
 # This file is up-to-date if the command git log --format="%aN <%aE>" | sort -u
 # gives no duplicates.
-Michael Hanke <michael.hanke@gmail.com> <mhanke-guest@82381867-18eb-0310-98a2-9474e637aba2>
-Michael Hanke <michael.hanke@gmail.com> <michaelhanke@mvpa1.dartmouth.edu>
-Yaroslav O. Halchenko <debian@onerussian.com> <yoh-guest@82381867-18eb-0310-98a2-9474e637aba2>
-Yaroslav O. Halchenko <debian@onerussian.com> Yaroslav Halchenko <debian@onerussian.com>
-Bertrand Thirion <bertrand.thirion@inria.fr> bthirion <bertrand.thirion@inria.fr>
-Stephan Gerhard <git@unidesign.ch> Stephan Gerhard <git@github.com>
-Christian Haselgrove <christian.haselgrove@umassmed.edu> Christian Haselgrove <Christian.Haselgrove@umassmed.edu>
-Cindee Madison <cindee@berkeley.edu> CindeeM <cindee@berkeley.edu>
-Cindee Madison <cindee@berkeley.edu> cindeem <cindee@berkeley.edu>
-Ian Nimmo-Smith <iannimmosmith@gmail.com> Ian Nimmo-Smith <ian.nimmo-smith@mrc-cbu.cam.ac.uk>
-Jean-Baptiste Poline <jbpoline@gmail.com> jbpoline <jbpoline@gmail.com>
-Félix C. Morency <felix.morency@gmail.com> Felix C. Morency <felix.c.morency@usherbrooke.ca>
-Félix C. Morency <felix.morency@gmail.com> Félix C. Morency <felix.c.morency@usherbrooke.ca>
-Krish Subramaniam <krish.subramaniam@gmail.com> Krish Subramaniam <krish@monster.nmr.mgh.harvard.edu>
-Eric Larson <larson.eric.d@gmail.com> Eric89GXL <larson.eric.d@gmail.com>
 Alexandre Gramfort <alexandre.gramfort@inria.fr> Alexandre Gramfort <alexandre.gramfort@m4x.org>
-Gael Varoquaux <gael.varoquaux@normalesup.org> GaelVaroquaux <gael.varoquaux@normalesup.org>
-Kevin S. Hahn <kevinshahn@gmail.com> Kevin S. Hahn <kshahn@stanford.edu>
+Ariel Rokem <arokem@gmail.com> arokem <arokem@gmail.com>
+B. Nolan Nichols <nolan.nichols@gmail.com> Nolan Nichols <nolan.nichols@gmail.com>
 Basile Pinsard <basile.pinsard@gmail.com> bpinsard <basile.pinsard@gmail.com>
 Basile Pinsard <basile.pinsard@gmail.com> bpinsard <bpinsard@imed.jussieu.fr>
-Nguyen, Ly <nguyen60@seattleu.edu> lxn2 <lxn2@uw.edu>
 Ben Cipollini <ben.cipollini@gmail.com> Ben Cipollini <bcipolli@ucsd.edu>
+Bertrand Thirion <bertrand.thirion@inria.fr> bthirion <bertrand.thirion@inria.fr>
+Christian Haselgrove <christian.haselgrove@umassmed.edu> Christian Haselgrove <Christian.Haselgrove@umassmed.edu>
+Christopher J. Markiewicz <markiewicz@stanford.edu> Chris Johnson <effigies@bu.edu>
 Christopher J. Markiewicz <markiewicz@stanford.edu> Chris Markiewicz <effigies@gmail.com>
 Christopher J. Markiewicz <markiewicz@stanford.edu> Chris Markiewicz <markiewicz@stanford.edu>
 Christopher J. Markiewicz <markiewicz@stanford.edu> Christopher J. Markiewicz <effigies@bu.edu>
 Christopher J. Markiewicz <markiewicz@stanford.edu> Christopher J. Markiewicz <effigies@gmail.com>
-Christopher J. Markiewicz <markiewicz@stanford.edu> Chris Johnson <effigies@bu.edu>
+Cindee Madison <cindee@berkeley.edu> CindeeM <cindee@berkeley.edu>
+Cindee Madison <cindee@berkeley.edu> cindeem <cindee@berkeley.edu>
+Demian Wassermann <demian@bwh.harvard.edu> Demian Wassermann <demian.wassermann@inria.fr>
+Dimitri Papadopoulos Orfanos <dimitri.papadopoulos@cea.fr> Dimitri Papadopoulos <DimitriPapadopoulos@users.noreply.github.com>
+Eric Larson <larson.eric.d@gmail.com> Eric89GXL <larson.eric.d@gmail.com>
+Fernando Pérez-García <fepegar@gmail.com> Fernando <fepegar@gmail.com>
+Félix C. Morency <felix.morency@gmail.com> Felix C. Morency <felix.c.morency@usherbrooke.ca>
+Félix C. Morency <felix.morency@gmail.com> Félix C. Morency <felix.c.morency@usherbrooke.ca>
+Gael Varoquaux <gael.varoquaux@normalesup.org> GaelVaroquaux <gael.varoquaux@normalesup.org>
+Gregory R. Lee <grlee77@gmail.com> Gregory R. Lee <gregory.lee@cchmc.org>
+Ian Nimmo-Smith <iannimmosmith@gmail.com> Ian Nimmo-Smith <ian.nimmo-smith@mrc-cbu.cam.ac.uk>
 Jaakko Leppäkangas <jaeilepp@student.jyu.fi> jaeilepp <jaeilepp@student.jyu.fi>
-Ariel Rokem <arokem@gmail.com> arokem <arokem@gmail.com>
-Oliver P. Hinds <ohinds@gmail.com> ohinds <ohinds@gmail.com>
-Marc-Alexandre Côté <marc.cote.19@gmail.com> Marc-Alexandre Cote <marc.cote.19@gmail.com>
-Satrajit Ghosh <satra@mit.edu> Satrajit Ghosh <satrajit.ghosh@gmail.com>
 Jasper J.F. van den Bosch <japsai@gmail.com> Jasper <japsai@gmail.com>
-Gregory R. Lee <grlee77@gmail.com> Gregory R. Lee <gregory.lee@cchmc.org>
-Demian Wassermann <demian@bwh.harvard.edu> Demian Wassermann <demian.wassermann@inria.fr>
-Paul McCarthy <pauldmccarthy@gmail.com> Paul McCarthy <pauld.mccarthy@gmail.com>
-B. Nolan Nichols <nolan.nichols@gmail.com> Nolan Nichols <nolan.nichols@gmail.com>
+Jean-Baptiste Poline <jbpoline@gmail.com> jbpoline <jbpoline@gmail.com>
+Jon Haitz Legarreta <jon.haitz.legarreta@gmail.com> Jon Haitz Legarreta Gorroño <jon.haitz.legarreta@gmail.com>
+Kesshi Jordan <Kesshi.Jordan@ucsf.edu> kesshijordan <Kesshi.Jordan@ucsf.edu>
+Kevin S. Hahn <kevinshahn@gmail.com> Kevin S. Hahn <kshahn@stanford.edu>
+Krish Subramaniam <krish.subramaniam@gmail.com> Krish Subramaniam <krish@monster.nmr.mgh.harvard.edu>
+Marc-Alexandre Côté <marc.cote.19@gmail.com> Marc-Alexandre Cote <marc.cote.19@gmail.com>
 Mathias Goncalves <mathiasg@mit.edu> mathiasg <mathiasg@mit.edu>
+Michael Hanke <michael.hanke@gmail.com> <mhanke-guest@82381867-18eb-0310-98a2-9474e637aba2>
+Michael Hanke <michael.hanke@gmail.com> <michaelhanke@mvpa1.dartmouth.edu>
+Nguyen, Ly <nguyen60@seattleu.edu> lxn2 <lxn2@uw.edu>
+Oliver P. Hinds <ohinds@gmail.com> ohinds <ohinds@gmail.com>
+Paul McCarthy <pauldmccarthy@gmail.com> Paul McCarthy <pauld.mccarthy@gmail.com>
+Satrajit Ghosh <satra@mit.edu> Satrajit Ghosh <satrajit.ghosh@gmail.com>
 Serge Koudoro <skab12@gmail.com> skoudoro <skab12@gmail.com>
-Kesshi Jordan <Kesshi.Jordan@ucsf.edu> kesshijordan <Kesshi.Jordan@ucsf.edu>
-Fernando Pérez-García <fepegar@gmail.com> Fernando <fepegar@gmail.com>
-Dimitri Papadopoulos Orfanos <dimitri.papadopoulos@cea.fr> Dimitri Papadopoulos <DimitriPapadopoulos@users.noreply.github.com>
+Stephan Gerhard <git@unidesign.ch> Stephan Gerhard <git@github.com>
 Thomas Roos <thomasroos@live.nl> Roosted7 <thomasroos@live.nl>
 Venky Reddy <R3DDY97@users.noreply.github.com> R3DDY97 <R3DDY97@users.noreply.github.com>
-Jon Haitz Legarreta <jon.haitz.legarreta@gmail.com> Jon Haitz Legarreta Gorroño <jon.haitz.legarreta@gmail.com>
+Yaroslav O. Halchenko <debian@onerussian.com> <yoh-guest@82381867-18eb-0310-98a2-9474e637aba2>
+Yaroslav O. Halchenko <debian@onerussian.com> Yaroslav Halchenko <debian@onerussian.com>

-Original file line number
+Diff line change
+#
 # This file is up-to-date if the command git log --format="%aN <%aE>" | sort -u
 # gives no duplicates.
 -Michael Hanke <[email protected]> <mhanke-guest@82381867-18eb-0310-98a2-9474e637aba2>
 -Michael Hanke <[email protected]> <[email protected]>
 -Yaroslav O. Halchenko <[email protected]> <yoh-guest@82381867-18eb-0310-98a2-9474e637aba2>
 -Yaroslav O. Halchenko <[email protected]> Yaroslav Halchenko <[email protected]>
 -Bertrand Thirion <[email protected]> bthirion <[email protected]>
 -Stephan Gerhard <[email protected]> Stephan Gerhard <[email protected]>
 -Christian Haselgrove <[email protected]> Christian Haselgrove <[email protected]>
 -Cindee Madison <[email protected]> CindeeM <[email protected]>
 -Cindee Madison <[email protected]> cindeem <[email protected]>
 -Ian Nimmo-Smith <[email protected]> Ian Nimmo-Smith <[email protected]>
 -Jean-Baptiste Poline <[email protected]> jbpoline <[email protected]>
 -Félix C. Morency <[email protected]> Felix C. Morency <[email protected]>
 -Félix C. Morency <[email protected]> Félix C. Morency <[email protected]>
 -Krish Subramaniam <[email protected]> Krish Subramaniam <[email protected]>
 -Eric Larson <[email protected]> Eric89GXL <[email protected]>
 Alexandre Gramfort <[email protected]> Alexandre Gramfort <[email protected]>
 -Gael Varoquaux <[email protected]> GaelVaroquaux <[email protected]>
 -Kevin S. Hahn <kevinshahn@gmail.com> Kevin S. Hahn <[email protected]>
 +Ariel Rokem <[email protected]> arokem <[email protected]>
 +B. Nolan Nichols <nolan.nichols@gmail.com> Nolan Nichols <[email protected]>
 Basile Pinsard <[email protected]> bpinsard <[email protected]>
 Basile Pinsard <[email protected]> bpinsard <[email protected]>
 -Nguyen, Ly <[email protected]> lxn2 <[email protected]>
 Ben Cipollini <[email protected]> Ben Cipollini <[email protected]>
 +Bertrand Thirion <[email protected]> bthirion <[email protected]>
 +Christian Haselgrove <[email protected]> Christian Haselgrove <[email protected]>
 +Christopher J. Markiewicz <[email protected]> Chris Johnson <[email protected]>
 Christopher J. Markiewicz <[email protected]> Chris Markiewicz <[email protected]>
 Christopher J. Markiewicz <[email protected]> Chris Markiewicz <[email protected]>
 Christopher J. Markiewicz <[email protected]> Christopher J. Markiewicz <[email protected]>
 Christopher J. Markiewicz <[email protected]> Christopher J. Markiewicz <[email protected]>
 -Christopher J. Markiewicz <[email protected]> Chris Johnson <[email protected]>
 +Cindee Madison <[email protected]> CindeeM <[email protected]>
 +Cindee Madison <[email protected]> cindeem <[email protected]>
 +Demian Wassermann <[email protected]> Demian Wassermann <[email protected]>
 +Dimitri Papadopoulos Orfanos <[email protected]> Dimitri Papadopoulos <[email protected]>
 +Eric Larson <[email protected]> Eric89GXL <[email protected]>
 +Fernando Pérez-García <[email protected]> Fernando <[email protected]>
 +Félix C. Morency <[email protected]> Felix C. Morency <[email protected]>
 +Félix C. Morency <[email protected]> Félix C. Morency <[email protected]>
 +Gael Varoquaux <[email protected]> GaelVaroquaux <[email protected]>
 +Gregory R. Lee <[email protected]> Gregory R. Lee <[email protected]>
 +Ian Nimmo-Smith <[email protected]> Ian Nimmo-Smith <[email protected]>
 Jaakko Leppäkangas <[email protected]> jaeilepp <[email protected]>
 -Ariel Rokem <[email protected]> arokem <[email protected]>
 -Oliver P. Hinds <[email protected]> ohinds <[email protected]>
 -Marc-Alexandre Côté <[email protected]> Marc-Alexandre Cote <[email protected]>
 -Satrajit Ghosh <[email protected]> Satrajit Ghosh <[email protected]>
 Jasper J.F. van den Bosch <[email protected]> Jasper <[email protected]>
 -Gregory R. Lee <[email protected]> Gregory R. Lee <[email protected]>
 -Demian Wassermann <[email protected]> Demian Wassermann <[email protected]>
 -Paul McCarthy <[email protected]> Paul McCarthy <[email protected]>
 -B. Nolan Nichols <[email protected]> Nolan Nichols <[email protected]>
 +Jean-Baptiste Poline <[email protected]> jbpoline <[email protected]>
 +Jon Haitz Legarreta <[email protected]> Jon Haitz Legarreta Gorroño <[email protected]>
 +Kesshi Jordan <[email protected]> kesshijordan <[email protected]>
 +Kevin S. Hahn <[email protected]> Kevin S. Hahn <[email protected]>
 +Krish Subramaniam <[email protected]> Krish Subramaniam <[email protected]>
 +Marc-Alexandre Côté <[email protected]> Marc-Alexandre Cote <[email protected]>
 Mathias Goncalves <[email protected]> mathiasg <[email protected]>
 +Michael Hanke <[email protected]> <mhanke-guest@82381867-18eb-0310-98a2-9474e637aba2>
 +Michael Hanke <[email protected]> <[email protected]>
 +Nguyen, Ly <[email protected]> lxn2 <[email protected]>
 +Oliver P. Hinds <[email protected]> ohinds <[email protected]>
 +Paul McCarthy <[email protected]> Paul McCarthy <[email protected]>
 +Satrajit Ghosh <[email protected]> Satrajit Ghosh <[email protected]>
 Serge Koudoro <[email protected]> skoudoro <[email protected]>
 -Kesshi Jordan <[email protected]> kesshijordan <[email protected]>
 -Fernando Pérez-García <[email protected]> Fernando <[email protected]>
 -Dimitri Papadopoulos Orfanos <[email protected]> Dimitri Papadopoulos <[email protected]>
 +Stephan Gerhard <[email protected]> Stephan Gerhard <[email protected]>
 Thomas Roos <[email protected]> Roosted7 <[email protected]>
 Venky Reddy <[email protected]> R3DDY97 <[email protected]>
 -Jon Haitz Legarreta <[email protected]> Jon Haitz Legarreta Gorroño <[email protected]>
 +Yaroslav O. Halchenko <[email protected]> <yoh-guest@82381867-18eb-0310-98a2-9474e637aba2>
 +Yaroslav O. Halchenko <[email protected]> Yaroslav Halchenko <[email protected]>