MAINT: Update/sort mailmap

mgxd · mgxd · commit 0250bb174576 · 2022-09-01T14:38:39.000-04:00
diff --git a/.mailmap b/.mailmap
@@ -6,8 +6,8 @@ Alejandro Tabas <alextabas@gmail.com> <qtabas@gmail.com>
 Alejandro de la Vega <aleph4@gmail.com>
 Alejandro de la Vega <aleph4@gmail.com> <delavega@utexas.edu>
 Alexander Schaefer <alexschaefer83@gmail.com>
-Alexander Schaefer <alexschaefer83@gmail.com> <aschaefer@melisse.cbs.mpg.de>
 Alexander Schaefer <alexschaefer83@gmail.com> <aschaefer@aschaefer-U36SD.(none)>
+Alexander Schaefer <alexschaefer83@gmail.com> <aschaefer@melisse.cbs.mpg.de>
 Alexandre M. Savio <alexsavio@gmail.com>
 Alexandre M. Savio <alexsavio@gmail.com> <alexsavio@users.noreply.github.com>
 Andrea Dell'Orco <orco@paranoici.org>
@@ -22,9 +22,9 @@ Anna Doll <45283972+AnnaD15@users.noreply.github.com>
 Ariel Rokem <arokem@berkeley.edu>
 Ariel Rokem <arokem@berkeley.edu> <arokem@gmail.com>
 Arman Eshaghi <arman.eshaghi@gmail.com>
+Ashely Gillman <gillmanash@gmail.com> <ashley.gillman@csiro.au>
 Avneet Kaur <avneetkaur@bohr.neurobio.nru.dk>
 Avneet Kaur <avneetkaur@bohr.neurobio.nru.dk> <avneet14027@iiitd.ac.in>
-Ashely Gillman <gillmanash@gmail.com> <ashley.gillman@csiro.au>
 Basille Pinsard <basile.pinsard@umontreal.ca>
 Basille Pinsard <basile.pinsard@umontreal.ca> <bpinsard@imed.jussieu.fr>
 Ben Cipollini <bcipollini@classy.org> <bcipolli@ucsd.edu>
@@ -39,8 +39,8 @@ Blake Dewey <blake.dewey@jhu.edu> <deweybe@ndsl-nib-bdewey.ninds.nih.gov>
 Brendan Moloney <moloney.brendan@gmail.com>
 Caroline Froehlich <carol.frohlich@gmail.com>
 Christopher J. Markiewicz <effigies@gmail.com>
-Christopher J. Markiewicz <effigies@gmail.com> <markiewicz@stanford.edu>
 Christopher J. Markiewicz <effigies@gmail.com> <effigies@bu.edu>
+Christopher J. Markiewicz <effigies@gmail.com> <markiewicz@stanford.edu>
 Christopher John Steele <steelec@gmail.com>
 Cindee Madison <cindee@berkeley.edu>
 Colin Buchanan <colinrbuchanan@gmail.com>
@@ -49,8 +49,8 @@ Colin Buchanan <colinrbuchanan@gmail.com> <mankind@MacBook.local>
 Daniel Brenner <daniel.brenner@me.com>
 Daniel Clark <danieljclark87@gmail.com>
 Daniel Geisler <daniel.geisler@gmail.com>
-Daniel Geisler <daniel.geisler@gmail.com> <daniel.geisler@uniklinikum-dresden.de>
 Daniel Geisler <daniel.geisler@gmail.com> <3453485+daniel-ge@users.noreply.github.com>
+Daniel Geisler <daniel.geisler@gmail.com> <daniel.geisler@uniklinikum-dresden.de>
 Daniel Ginsburg <daniel.ginsburg@childrens.harvard.edu>
 Daniel McNamee <dmcx88@gmail.com>
 David Ellis <dgellis90@gmail.com> <david-ellis@uiowa.edu>
@@ -89,17 +89,17 @@ Hrvoje Stojic <hrvoje.stojic@protonmail.com>
 Isaac Schwabacher <ischwabacher@wisc.edu>
 Jakub Kaczmarzyk <jakubk@mit.edu>
 James Kent <james-kent@uiowa.edu>
-James Kent <james-kent@uiowa.edu> <mertzf@bargle.argle>
 James Kent <james-kent@uiowa.edu> <jamesdkent21@gmail.com>
+James Kent <james-kent@uiowa.edu> <mertzf@bargle.argle>
 Janosch Linkersdörfer <linkersdoerfer@gmail.com>
 Jason Wong <jf126dolphin@gmail.com>
 Jason Wong <jf126dolphin@gmail.com> <jasonwong73@ucla.edu>
 Jens Kleesiek <kleesiek@uni-heidelberg.de>
 Jessica Forbes <jessica-forbes@uiowa.edu>
 Jérémy Guillon <jeremy.guillon@inria.fr> <jeremy.guillon@etu.upmc.fr>
+Joerg Stadler <Joerg.Stadler@lin-magdeburg.de> <Stadler@lin-magdeburg.de>
 Joerg Stadler <Joerg.Stadler@lin-magdeburg.de> <joerg.stadler@lin-magdeburg.de>
 Joerg Stadler <Joerg.Stadler@lin-magdeburg.de> <jstadler@ilin-magdeburg.de>
-Joerg Stadler <Joerg.Stadler@lin-magdeburg.de> <Stadler@lin-magdeburg.de>
 John A. Lee <johnleenimh@gmail.com>
 John A. Lee <johnleenimh@gmail.com> <leej3@users.noreply.github.com>
 Joke Durnez <joke.durnez@gmail.com>
@@ -116,39 +116,37 @@ Kesshi Jordan <Kesshi.Jordan@ucsf.edu> <kesshijordan@iPhone-010060104098.ucsf.ed
 Kesshi Jordan <Kesshi.Jordan@ucsf.edu> <kjordan@codd.radiology.ucsf.edu>
 Kevin Sitek <ksitek@mit.edu>
 Kevin Sitek <ksitek@mit.edu> <sitek.kevin@gmail.com>
-Sin Kim <kimsin98@gmail.com>
-Sin Kim <kimsin98@gmail.com> <AKSoo@users.noreply.github.com>
 Koen Helwegen <kg.helwegen@gmail.com>
 Kornelius Podranski <kilo13@web.de>
 Kristofer Montazeri <kristofer.montazeri@gmail.com>
 Krzysztof J. Gorgolewski <krzysztof.gorgolewski@gmail.com>
 Krzysztof J. Gorgolewski <krzysztof.gorgolewski@gmail.com> <chris.gorgolewski@gmail.com>
 Krzysztof J. Gorgolewski <krzysztof.gorgolewski@gmail.com> <filo@filo-Precision-M6500.(none)>
-Krzysztof J. Gorgolewski <krzysztof.gorgolewski@gmail.com> <krzysztof.gorgolewski+fake@gmail.com>
 Krzysztof J. Gorgolewski <krzysztof.gorgolewski@gmail.com> <filo@filo-Precision-M6500>
 Krzysztof J. Gorgolewski <krzysztof.gorgolewski@gmail.com> <filo@filo-dtc-laptop>
 Krzysztof J. Gorgolewski <krzysztof.gorgolewski@gmail.com> <filo@filolaptop>
+Krzysztof J. Gorgolewski <krzysztof.gorgolewski@gmail.com> <krzysztof.gorgolewski+fake@gmail.com>
 Kshitij Chawla <kc.insight.pi@gmail.com>
 Leonie Lampe <leonie.lampe@gmail.com>
 Lukas Snoek <lukassnoek@gmail.com>
 Marcel Falkiewicz <mfalkiewicz@gmail.com> <m.falkiewicz@nencki.gov.pl>
 Maria de Fatima Dias <mfatimamachado13@gmail.com>
 Maria de Fatima Dias <mfatimamachado13@gmail.com> <fmachado@dei.uc.pt>
-Martin Perez-Guevara <mperezguevara@gmail.com>
 Martin Norgaard <martin.noergaard@nru.dk>
+Martin Perez-Guevara <mperezguevara@gmail.com>
 Mathias Goncalves <goncalves.mathias@gmail.com> <mathiasg@mit.edu>
 Mathias Goncalves <goncalves.mathias@gmail.com> <mathiasg@stanford.edu>
-Mathieu Dubois <mathieu.dubois@icm-institute.org> <mathieu.dubois@cea.fr>
 Mathieu Dubois <mathieu.dubois@icm-institute.org> <duboismathieu_gaas@yahoo.fr>
+Mathieu Dubois <mathieu.dubois@icm-institute.org> <mathieu.dubois@cea.fr>
 Matteo Mancini <ingmatteomancini@gmail.com>
 Matteo Visconti di Oleggio Castello <matteo.visconti.gr@dartmouth.edu>
 Matteo Visconti di Oleggio Castello <matteo.visconti.gr@dartmouth.edu> <mvdoc.gr@dartmouth.edu>
 Matthew Cieslak <mattcieslak@gmail.com>
 Michael Clark <michael.clark195@gmail.com> <clarkmg@nih.gov>
 Michael Dayan <mdayan.research@gmail.com>
 Michael Dayan <mdayan.research@gmail.com> <mdayan.comp@gmail.com>
-Michael Dayan <mdayan.research@gmail.com> mick-d <mid2021@CHUCK.(none)>
 Michael Dayan <mdayan.research@gmail.com> <michael@mail.example.com>
+Michael Dayan <mdayan.research@gmail.com> mick-d <mid2021@CHUCK.(none)>
 Michael Joseph <josephmje.22@gmail.com>
 Michael Joseph <josephmje.22@gmail.com> <mjoseph@scclogin02.camhres.ca>
 Michael Philipp Notter <michaelnotter@hotmail.com>
@@ -171,8 +169,8 @@ Paul Kuntke <paul@42degreesoffreedom.com> <paul@kuntke.de>
 Paul Sharp <psharp1289@gmail.com>
 Ranjit Khanuja <ranjit.jhu@gmail.com>
 Rastko Ćirić <rc042010@mymail.pomona.edu>
-Rastko Ćirić <rc042010@mymail.pomona.edu> <rciric@users.noreply.github.com>
 Rastko Ćirić <rc042010@mymail.pomona.edu> <rastko@stanford.edu>
+Rastko Ćirić <rc042010@mymail.pomona.edu> <rciric@users.noreply.github.com>
 Raunak Jalan <ronakjalan98@gmail.com>
 Raunak Jalan <ronakjalan98@gmail.com> <41023976+RaunakJalan@users.noreply.github.com>
 Ross Markello <rossmarkello@gmail.com> <rdm222@cornell.edu>
@@ -186,15 +184,17 @@ Serge Koudoro <skab12@gmail.com>
 Sharad Sikka <ssikka25@gmail.com>
 Shariq Iqbal <shariqiqbal2810@gmail.com>
 Shariq Iqbal <shariqiqbal2810@gmail.com> <shariqiqbal2810@users.noreply.github.com>
-Shoshana Berleant <berleant@stanford.edu> Shoshana Berleant <nope>
 Shoshana Berleant <berleant@stanford.edu> <shoshber@users.noreply.github.com>
+Shoshana Berleant <berleant@stanford.edu> Shoshana Berleant <nope>
 Shoshana Berleant <berleant@stanford.edu> Ubuntu <ubuntu@ip-172-31-43-202.us-west-2.compute.internal>
 Simon Rothmei <srothmei@mailbox.tu-berlin.de>
 Simon Rothmei <srothmei@mailbox.tu-berlin.de> <srothmei@users.noreply.github.com>
+Sin Kim <kimsin98@gmail.com>
+Sin Kim <kimsin98@gmail.com> <AKSoo@users.noreply.github.com>
 Siqi Liu <lsqshr@gmail.com>
 Steven Giavasis <sgiava77@gmail.com>
-Steven Giavasis <sgiava77@gmail.com> <steven.giavasis@cmi-rsch-li001.childmind.org>
 Steven Giavasis <sgiava77@gmail.com> <sgiavasis@ieee.org>
+Steven Giavasis <sgiava77@gmail.com> <steven.giavasis@cmi-rsch-li001.childmind.org>
 Steven Tilley <stilley@hollandbloorview.ca> <steve@steventilley.com>
 Sulantha Mathotaarachchi <sulantha.s@gmail.com>
 Sunjae Shim <85246533+sjshim@users.noreply.github.com>

-Original file line number
+Diff line change
 Alejandro de la Vega <[email protected]>
 Alejandro de la Vega <[email protected]> <[email protected]>
 Alexander Schaefer <[email protected]>
 -Alexander Schaefer <[email protected]> <[email protected]>
 Alexander Schaefer <[email protected]> <aschaefer@aschaefer-U36SD.(none)>
 +Alexander Schaefer <[email protected]> <[email protected]>
 Alexandre M. Savio <[email protected]>
 Alexandre M. Savio <[email protected]> <[email protected]>
 Andrea Dell'Orco <[email protected]>
 Ariel Rokem <[email protected]>
 Ariel Rokem <[email protected]> <[email protected]>
 Arman Eshaghi <[email protected]>
 +Ashely Gillman <[email protected]> <[email protected]>
 Avneet Kaur <[email protected]>
 Avneet Kaur <[email protected]> <[email protected]>
 -Ashely Gillman <[email protected]> <[email protected]>
 Basille Pinsard <[email protected]>
 Basille Pinsard <[email protected]> <[email protected]>
 Ben Cipollini <[email protected]> <[email protected]>
 Brendan Moloney <[email protected]>
 Caroline Froehlich <[email protected]>
 Christopher J. Markiewicz <[email protected]>
 -Christopher J. Markiewicz <[email protected]> <[email protected]>
 Christopher J. Markiewicz <[email protected]> <[email protected]>
 +Christopher J. Markiewicz <[email protected]> <[email protected]>
 Christopher John Steele <[email protected]>
 Cindee Madison <[email protected]>
 Colin Buchanan <[email protected]>
 Daniel Brenner <[email protected]>
 Daniel Clark <[email protected]>
 Daniel Geisler <[email protected]>
 -Daniel Geisler <[email protected]> <[email protected]>
 Daniel Geisler <[email protected]> <[email protected]>
 +Daniel Geisler <[email protected]> <[email protected]>
 Daniel Ginsburg <[email protected]>
 Daniel McNamee <[email protected]>
 David Ellis <[email protected]> <[email protected]>
 Isaac Schwabacher <[email protected]>
 Jakub Kaczmarzyk <[email protected]>
 James Kent <[email protected]>
 -James Kent <[email protected]> <[email protected]>
 James Kent <[email protected]> <[email protected]>
 +James Kent <[email protected]> <[email protected]>
 Janosch Linkersdörfer <[email protected]>
 Jason Wong <[email protected]>
 Jason Wong <[email protected]> <[email protected]>
 Jens Kleesiek <[email protected]>
 Jessica Forbes <[email protected]>
 Jérémy Guillon <[email protected]> <[email protected]>
 +Joerg Stadler <[email protected]> <[email protected]>
 Joerg Stadler <[email protected]> <[email protected]>
 Joerg Stadler <[email protected]> <[email protected]>
 -Joerg Stadler <[email protected]> <[email protected]>
 John A. Lee <[email protected]>
 John A. Lee <[email protected]> <[email protected]>
 Joke Durnez <[email protected]>
 Kesshi Jordan <[email protected]> <[email protected]>
 Kevin Sitek <[email protected]>
 Kevin Sitek <[email protected]> <[email protected]>
 -Sin Kim <[email protected]>
 -Sin Kim <[email protected]> <[email protected]>
 Koen Helwegen <[email protected]>
 Kornelius Podranski <[email protected]>
 Kristofer Montazeri <[email protected]>
 Krzysztof J. Gorgolewski <[email protected]>
 Krzysztof J. Gorgolewski <[email protected]> <[email protected]>
 Krzysztof J. Gorgolewski <[email protected]> <filo@filo-Precision-M6500.(none)>
 -Krzysztof J. Gorgolewski <[email protected]> <[email protected]>
 Krzysztof J. Gorgolewski <[email protected]> <filo@filo-Precision-M6500>
 Krzysztof J. Gorgolewski <[email protected]> <filo@filo-dtc-laptop>
 Krzysztof J. Gorgolewski <[email protected]> <filo@filolaptop>
 +Krzysztof J. Gorgolewski <[email protected]> <[email protected]>
 Kshitij Chawla <[email protected]>
 Leonie Lampe <[email protected]>
 Lukas Snoek <[email protected]>
 Marcel Falkiewicz <[email protected]> <[email protected]>
 Maria de Fatima Dias <[email protected]>
 Maria de Fatima Dias <[email protected]> <[email protected]>
 -Martin Perez-Guevara <[email protected]>
 Martin Norgaard <[email protected]>
 +Martin Perez-Guevara <[email protected]>
 Mathias Goncalves <[email protected]> <[email protected]>
 Mathias Goncalves <[email protected]> <[email protected]>
 -Mathieu Dubois <[email protected]> <[email protected]>
 Mathieu Dubois <[email protected]> <[email protected]>
 +Mathieu Dubois <[email protected]> <[email protected]>
 Matteo Mancini <[email protected]>
 Matteo Visconti di Oleggio Castello <[email protected]>
 Matteo Visconti di Oleggio Castello <[email protected]> <[email protected]>
 Matthew Cieslak <[email protected]>
 Michael Clark <[email protected]> <[email protected]>
 Michael Dayan <[email protected]>
 Michael Dayan <[email protected]> <[email protected]>
 -Michael Dayan <[email protected]> mick-d <mid2021@CHUCK.(none)>
 Michael Dayan <[email protected]> <[email protected]>
 +Michael Dayan <[email protected]> mick-d <mid2021@CHUCK.(none)>
 Michael Joseph <[email protected]>
 Michael Joseph <[email protected]> <[email protected]>
 Michael Philipp Notter <[email protected]>
 Paul Sharp <[email protected]>
 Ranjit Khanuja <[email protected]>
 Rastko Ćirić <[email protected]>
 -Rastko Ćirić <[email protected]> <[email protected]>
 Rastko Ćirić <[email protected]> <[email protected]>
 +Rastko Ćirić <[email protected]> <[email protected]>
 Raunak Jalan <[email protected]>
 Raunak Jalan <[email protected]> <[email protected]>
 Ross Markello <[email protected]> <[email protected]>
 Sharad Sikka <[email protected]>
 Shariq Iqbal <[email protected]>
 Shariq Iqbal <[email protected]> <[email protected]>
 -Shoshana Berleant <[email protected]> Shoshana Berleant <nope>
 Shoshana Berleant <[email protected]> <[email protected]>
 +Shoshana Berleant <[email protected]> Shoshana Berleant <nope>
 Shoshana Berleant <[email protected]> Ubuntu <[email protected]>
 Simon Rothmei <[email protected]>
 Simon Rothmei <[email protected]> <[email protected]>
 +Sin Kim <[email protected]>
 +Sin Kim <[email protected]> <[email protected]>
 Siqi Liu <[email protected]>
 Steven Giavasis <[email protected]>
 -Steven Giavasis <[email protected]> <[email protected]>
 Steven Giavasis <[email protected]> <[email protected]>
 +Steven Giavasis <[email protected]> <[email protected]>
 Steven Tilley <[email protected]> <[email protected]>
 Sulantha Mathotaarachchi <[email protected]>
 Sunjae Shim <[email protected]>