From 0efa1a0e3d4d49b3b4c13653f2d9c506299867a1 Mon Sep 17 00:00:00 2001
From: Chris Markiewicz <effigies@gmail.com>
Date: Wed, 14 Aug 2024 11:35:21 -0400
Subject: [PATCH] Update/prune mailmap

---
 .mailmap | 47 +++++++++++++++++++++--------------------------
 1 file changed, 21 insertions(+), 26 deletions(-)

diff --git a/.mailmap b/.mailmap
index 616df92..9726f9e 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,41 +1,36 @@
-Adam Thomas <git@adamthomas.us>
-Adam Thomas <git@adamthomas.us> <github@adamthomas.us>
-Brian Grass <brian@squishymedia.com>
-Brian Grass <brian@squishymedia.com> <bGrass@users.noreply.github.com>
-Chris Holdgraf <choldgraf@berkeley.edu>
-Chris Holdgraf <choldgraf@berkeley.edu> <choldgraf@gmail.com>
+Alex Rockhill <aprockhill@mailbox.org>
+Basile Pinsard <basile.pinsard@gmail.com>
 Christopher J. Markiewicz <markiewicz@stanford.edu>
+Christopher J. Markiewicz <markiewicz@stanford.edu> <effigies@gmail.com>
+Cyril Pernet <wamcyril@gmail.com>
 David Nishikawa <david@squishymedia.com>
 David Nishikawa <david@squishymedia.com> <28666458+DaNish808@users.noreply.github.com>
 Dianne Patterson <dkp@email.arizona.edu>
-Eduard Ort <e.ort@vu.nl>
-Gregory Noack <greg@squishymedia.com>
-Gregory Noack <greg@squishymedia.com> <gregorynoack@thinknoack.com>
-Joke Durnez <joke.durnez@gmail.com>
-Joseph Wexler <jbwexler@hushmail.com>
+Dimitri Papadopoulos Orfanos <3234522+DimitriPapadopoulos@users.noreply.github.com>
+Dora Hermes <hermes.dora@mayo.edu>
+Etienne Bergeron <etienne-1.bergeron@polymtl.ca>
+Etienne Bergeron <etienne-1.bergeron@polymtl.ca> <79805277+etiennebergeron@users.noreply.github.com>
+Horea Christian <chr@chymera.eu>
+Horea Christian <chr@chymera.eu> <horea.christ@yandex.com>
 Krzysztof J. Gorgolewski <krzysztof.gorgolewski@gmail.com>
-Matthew Zito <matthewtzito@gmail.com>
-Matthew Zito <matthewtzito@gmail.com> <47864657+MatthewZito@users.noreply.github.com>
-Mikaël Naveau <naveau.mikael@gmail.com>
-Mikaël Naveau <naveau.mikael@gmail.com> <naveau@cyceron.fr>
+Marie-Helene Bourget <bourgetmarieh@gmail.com>
+Marie-Helene Bourget <bourgetmarieh@gmail.com> <54086142+mariehbourget@users.noreply.github.com>
+Martin Norgaard <martin.noergaard@nru.dk>
+Max van den Boom <m.a.vandenboom84@gmail.com>
+Max van den Boom <m.a.vandenboom84@gmail.com> <43676624+MaxvandenBoom@users.noreply.github.com>
 Nell Hardcastle <nell@dev-nell.com>
 Nell Hardcastle <nell@dev-nell.com> <nell@squishymedia.com>
-Parul Sethi <parul1sethi@gmail.com>
 Ross Blair <rosswilsonblair@gmail.com>
-Robert Oostenveld <r.oostenveld@gmail.com>
-Robert Oostenveld <r.oostenveld@gmail.com> <r.oostenveld@donders.ru.nl>
+Robert Luke <code@robertluke.net>
+Robert Luke <code@robertluke.net> <hello@robertluke.net>
+Robert Luke <code@robertluke.net> <748691+rob-luke@users.noreply.github.com>
 Ross Blair <rosswilsonblair@gmail.com> <rblair2@stanford.edu>
-Russell Poldrack <poldrack@gmail.com>
-Soichi Hayashi <hayashis@iu.edu>
-Soichi Hayashi <hayashis@iu.edu> <soichih@gmail.com>
-Suyash Bhogawar <suyashdb@gmail.com>
-Suyash Bhogawar <suyashdb@gmail.com> <admin@psy-qp02708q5pm.stanford.edu>
-Suyash Bhogawar <suyashdb@gmail.com> <suyashdb@login1.ls5.tacc.utexas.edu>
+Sein Jeung <seinjeung@gmail.com>
 Teal Hobson-Lowther <teal@squishymedia.com>
 Teal Hobson-Lowther <teal@squishymedia.com> <tealhobsonlowther@gmail.com>
-Travis Riddle <riddlet@gmail.com>
-Wazeer Zulfikar <wazeer.zulfikar@gmail.com>
 Yaroslav O. Halchenko <debian@onerussian.com>
+Yuan Wang <wang17@ualberta.ca>
+Yuan Wang <wang17@ualberta.ca> <35284474+konantian@users.noreply.github.com>
 Zack Michael <zack@squishymedia.com>
 Zack Michael <zack@squishymedia.com> <constellates@users.noreply.github.com>
 Zack Michael <zack@squishymedia.com> <zachary0michael@gmail.com>