From 605db9ea2cd5d96219d6ebe997f21e8cda045ba2 Mon Sep 17 00:00:00 2001
From: Chris Markiewicz <effigies@gmail.com>
Date: Wed, 20 Mar 2024 16:36:27 -0400
Subject: [PATCH] Update mailmap

---
 .mailmap | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/.mailmap b/.mailmap
index 1f6bdee6fc..9f542a3df7 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,10 +1,10 @@
 Abel A. González Orozco <glez.orzco@gmail.com>
 Aimi Watanabe <watanabe.aimi@gmail.com>
 Aimi Watanabe <watanabe.aimi@gmail.com> stymy <rschadmin@cmi-rsch-li002.childmind.org>
-Alejandro Tabas <alextabas@gmail.com>
-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>
+Alejandro Tabas <alextabas@gmail.com>
+Alejandro Tabas <alextabas@gmail.com> <qtabas@gmail.com>
 Alexander Schaefer <alexschaefer83@gmail.com>
 Alexander Schaefer <alexschaefer83@gmail.com> <aschaefer@aschaefer-U36SD.(none)>
 Alexander Schaefer <alexschaefer83@gmail.com> <aschaefer@melisse.cbs.mpg.de>
@@ -65,9 +65,11 @@ Dylan M. Nielson <adenosine@gmail.com>
 Dylan M. Nielson <adenosine@gmail.com> <Dylan.Nielson@nih.gov>
 Eduard Ort <e.ort@vu.nl>
 Elizabeth DuPre <emd222@cornell.edu>
+Eric Condamine <econdami@yahoo.fr>
+Eric Condamine <econdami@yahoo.fr> <37933899+servoz@users.noreply.github.com>
 Erik Ziegler <erik.sweed@gmail.com>
-Erik Ziegler <erik.sweed@gmail.com> <erik.ziegler@ulg.ac.be>
 Erik Ziegler <erik.sweed@gmail.com> <erik@erik-ubuntu.(none)>
+Erik Ziegler <erik.sweed@gmail.com> <erik.ziegler@ulg.ac.be>
 Fabio Bernardoni <fabio.bernardoni@uniklinikum-dresden.de>
 Fabio Bernardoni <fabio.bernardoni@uniklinikum-dresden.de> <fb.brnrdn@gmail.com>
 Feilong Ma <mafeilong@gmail.com>
@@ -77,6 +79,7 @@ Franz Liem <franz.liem@gmail.com> <franz.liem>
 Fred Loney <loneyf@ohsu.edu>
 Gael Varoquaux <gael.varoquaux@normalesup.org>
 Gal Ben-Zvi <hershkovitz1@mail.tau.ac.il>
+Gal Ben-Zvi <hershkovitz1@mail.tau.ac.il> <galkepler@gmail.com>
 Gavin Cooper <Gavin.Cooper@newcastle.edu.au> <gjcooper@gmail.com>
 Ghislain Vaillant <ghislain.vaillant@icm-institute.org>
 Ghislain Vaillant <ghislain.vaillant@icm-institute.org> <ghisvail@users.noreply.github.com>
@@ -96,11 +99,11 @@ 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>
 Jérémy Guillon <jeremy.guillon@inria.fr> <jeremy.guillon@etu.upmc.fr>
-Joerg Stadler <Joerg.Stadler@lin-magdeburg.de> <Stadler@lin-magdeburg.de>
+Jessica Forbes <jessica-forbes@uiowa.edu>
 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>
@@ -110,9 +113,9 @@ Junhao WEN <anbai106@hotmail.com>
 Kai Schlamp <schlamp@gmx.de>
 Katherine Bottenhorn <kbott006@fiu.edu>
 Kesshi Jordan <Kesshi.Jordan@ucsf.edu>
-Kesshi Jordan <Kesshi.Jordan@ucsf.edu> <kesshi.jordan@gmail.com>
 Kesshi Jordan <Kesshi.Jordan@ucsf.edu> <kesshijordan@D-108-179-130-38.dhcp4.washington.edu>
 Kesshi Jordan <Kesshi.Jordan@ucsf.edu> <kesshijordan@D-69-91-152-99.dhcp4.washington.edu>
+Kesshi Jordan <Kesshi.Jordan@ucsf.edu> <kesshi.jordan@gmail.com>
 Kesshi Jordan <Kesshi.Jordan@ucsf.edu> <kesshijordan@iPhone-010060104098.ucsf.edu>
 Kesshi Jordan <Kesshi.Jordan@ucsf.edu> <kjordan@codd.radiology.ucsf.edu>
 Kevin Sitek <ksitek@mit.edu>
@@ -122,10 +125,10 @@ 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> <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> <filo@filo-Precision-M6500>
+Krzysztof J. Gorgolewski <krzysztof.gorgolewski@gmail.com> <filo@filo-Precision-M6500.(none)>
 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>
@@ -163,8 +166,8 @@ Oliver Contier <o.contier@gmail.com> <oliver.contier@ovgu.de>
 Olivia Stanley <oliviawstanley@gmail.com>
 Oscar Esteban <code@oscaresteban.es>
 Oscar Esteban <code@oscaresteban.es> <code@oscaresteban>
-Pablo Polosecki <pipolose@us.ibm.com> <pipolose@pipoloses-MacBook-Air.local>
 Pablo Polosecki <pipolose@us.ibm.com> <pipolose@pipoloses-air.watson.ibm.com>
+Pablo Polosecki <pipolose@us.ibm.com> <pipolose@pipoloses-MacBook-Air.local>
 Paul Kuntke <paul@42degreesoffreedom.com>
 Paul Kuntke <paul@42degreesoffreedom.com> <paul@kuntke.de>
 Paul Sharp <psharp1289@gmail.com>
@@ -185,8 +188,8 @@ 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> <shoshber@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> 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>
@@ -210,5 +213,7 @@ Victor Saase <victor@saase.net>
 Weijie Huang <hwjbupt@gmail.com>
 William Triplett <wtriplett@gmail.com> <wtriplett@ufl.edu>
 Wolfgang Pauli <Wolfgang.m.Pauli@gmail.com>
+Wu Jianxiao <jianxiao.wu.veronica@gmail.com>
+Wu Jianxiao <jianxiao.wu.veronica@gmail.com> <vesaveronica@gmail.com>
 Xiangzhen Kong <bnucon@gmail.com>
 Yaroslav Halchenko <debian@onerussian.com> <yoh@dartmouth.edu>