From 956d51c22597d550d0dcc9d29ee97c233ee44520 Mon Sep 17 00:00:00 2001
From: Tomas Janousek <tomi@nomi.cz>
Date: Thu, 21 Oct 2021 16:21:18 +0100
Subject: [PATCH] Update .mailmap

Drop lines that aren't needed.
Add lines to deduplicate people.
Add lines to add/fix some names.
---
 .mailmap | 56 +++++++++++++++++++++++++++++++-------------------------
 1 file changed, 31 insertions(+), 25 deletions(-)

diff --git a/.mailmap b/.mailmap
index ecb82155..db23ed45 100644
--- a/.mailmap
+++ b/.mailmap
@@ -13,90 +13,96 @@ Bogdan Sinitsyn <bogdan.sinitsyn@gmail.com>
 Brandon S Allbery KF8NH <allbery.b@gmail.com>
 Brandon S Allbery KF8NH <allbery.b@gmail.com> <allbery@ece.cmu.edu>
 Brent Yorgey <byorgey@gmail.com> <byorgey@cis.upenn.edu>
+Bruce Forte <fuererb@student.ethz.ch>
 Carlos Lopez-Camey <c.lopez@kmels.net>
 Carsten Otto <xmonad@c-otto.de>
+Cesar Crusius <ccrusius@google.com> <ccrusius@ccrusius-glaptop.roam.corp.google.com>
 Christian Dietrich <stettberger@dokucode.de>
 Christian Wills <cwills.dev@gmail.com>
 Daniel Neri <daniel.neri@sigicom.com> <daniel.neri@sigicom.se>
-Daniel Schoepe <daniel.schoepe@googlemail.com> <asgaroth_@gmx.de>
-Daniel Schoepe <daniel.schoepe@googlemail.com> <daniel.schoepe@gmail.com>
+Daniel Schoepe <daniel.schoepe@gmail.com> <asgaroth_@gmx.de>
+Daniel Schoepe <daniel.schoepe@gmail.com> <daniel.schoepe@googlemail.com>
 Daniel Wagner <me@dmwit.com> <daniel@wagner-home.com>
 Dave Harrison <dave@nullcube.com>
+Dave Macias <davama@gmail.com>
 David Glasser <glasser@mit.edu>
 David McLean <gopsychonauts@gmail.com>
+Devin Mullins <devin.mullins@gmail.com> <devinmullins@gmail.com>
 Devin Mullins <devin.mullins@gmail.com> <me@twifkak.com>
 Dominik Bruhn <dominik@dbruhn.de>
 Don Stewart <dons00@gmail.com> <dons@cse.unsw.edu.au>
 Don Stewart <dons00@gmail.com> <dons@galois.com>
 Edward Z. Yang <ezyang@cs.stanford.edu>
+Evgeny Kurnevsky <kurnevsky@gmail.com>
 Gwern Branwen <gwern@gwern.net>
 Gwern Branwen <gwern@gwern.net> <gwern0@gmail.com>
 Henrique Abreu <hgabreu@gmail.com>
 Ilya Portnov <portnov84@rambler.ru>
-intrigeri <intrigeri@boum.org>
+Ivan Brennen <ivan.brennan@gmail.com>
+Ivan Brennen <ivan.brennan@gmail.com> <ivanbrennan@users.noreply.github.com>
 Ivan Miljenovic <Ivan.Miljenovic@gmail.com>
 Jan-David Quesel <quesel@informatik.uni-oldenburg.de>
 Jens Petersen <juhp@community.haskell.org> <petersen@haskell.org>
 Jeremy Apthorp <nornagon@gmail.com>
 Joachim Breitner <mail@joachim-breitner.de>
 Joachim Fasting <joachim.fasting@gmail.com>
-Joel Suovaniemi <joel.suovaniemi@iki.fi>
+Joan Milev <joantmilev@gmail.com> <51526053+exorcist365@users.noreply.github.com>
 Joe Thornber <joe.thornber@gmail.com>
+Joel Suovaniemi <joel.suovaniemi@iki.fi>
 Johann Giwer <johanngiwer@web.de>
 Jussi Maki <joamaki@gmail.com>
 Konstantin Sobolev <konstantin.sobolev@gmail.com>
+L. S. Leary <LSLeary@users.noreply.github.com>
 Lanny Ripple <lan3ny@gmail.com>
 Lei Chen <linxray@gmail.com>
+Leon Kowarschick <lkowarschick@gmail.com>
+Leon Kowarschick <lkowarschick@gmail.com> <5300871+elkowar@users.noreply.github.com>
 Leonardo Serra <leoserra@minaslivre.org>
+Luc Duzan <lduzan@linagora.com>
+Luc Duzan <lduzan@linagora.com> <stroky.l@gmail.com>
 Luis Cabellos <zhen.sydow@gmail.com>
 Lukas Mai <l.mai@web.de>
 Mario Pastorelli <pastorelli.mario@gmail.com>
 Mathias Stearn <redbeard0531@gmail.com>
 Matt Brown <deadguysfrom@gmail.com>
 Matthew Hague <matthewhague@zoho.com>
+Michael G. Sloan <mgsloan@gmail.com>
 Nathaniel Filardo <nwfilardo@gmail.com>
 Nelson Elhage <nelhage@mit.edu>
 Nicolas Dudebout <nicolas.dudebout@gatech.edu>
 Nicolas Pouillard <nicolas.pouillard@gmail.com>
 Nils Schweinsberg <mail@n-sch.de>
 Norbert Zeh <nzeh@cs.dal.ca>
+Peter J. Jones <pjones@devalot.com>
+Peter J. Jones <pjones@devalot.com> <pjones@pmade.com>
 Peter Olson <polson2@hawk.iit.edu>
 Quentin Moser <moserq@gmail.com>
-Quentin Moser <quentin.moser@unifr.ch>
+Quentin Moser <moserq@gmail.com> <quentin.moser@unifr.ch>
 Rickard Gustafsson <acura@allyourbase.se>
 Robert Marlow <bobstopper@bobturf.org>
 Robert Marlow <bobstopper@bobturf.org> <robreim@bobturf.org>
 Rohan Jain <crodjer@gmail.com>
-Sibi Prabakaran <sibi@psibi.in> <psibi2000@gmail.com>
 Sean Escriva <sean.escriva@gmail.com>
 Sean McEligot <seanmce33@gmail.com>
+Sibi Prabakaran <sibi@psibi.in>
 Spencer Janssen <spencerjanssen@gmail.com> <sjanssen@cse.unl.edu>
-Tomohiro Matsuyama <matsuyama3@ariel-networks.com>
+Timothy Hobbs <tim.thelion@gmail.com>
 Tom Rauchenwald <its.sec@gmx.net>
+Tom Smeets <tom.tsmeets@gmail.com> <Tom.TSmeets@Gmail.com>
+Tomas Janousek <tomi@nomi.cz>
+Tomohiro Matsuyama <matsuyama3@ariel-networks.com>
 Tony Morris <haskell@tmorris.net>
 Valery V. Vorotyntsev <valery.vv@gmail.com>
 Will Farrington <wcfarrington@gmail.com>
 Wirt Wolff <wirtwolff@gmail.com>
 Yaakov Nemoy <loupgaroublond@gmail.com>
+Yclept Nemo <orbisvicis@gmail.com> <pscjtwjdjtAhnbjm/dpn>
+Yecine Megdiche <yecine.megdiche@gmail.com> <megdiche@in.tum.de>
 
-brian <brian@lorf.org>
-cardboard42 <cardboard42@gmail.com>
-daedalusinfinity <daedalusinfinity@gmail.com>
 hexago.nl <xmonad-contrib@hexago.nl>
-intrigeri <intrigeri@boum.org>
-jakob <jakob@pipefour.org>
-kedals0 <kedals0@gmail.com>
 lithis <xmonad@selg.hethrael.org>
 lithis <xmonad@selg.hethrael.org> <xmonad@s001.hethrael.com>
-longpoke <longpoke@gmail.com>
-md143rbh7f <md143rbh7f@gmail.com>
-perlkat <perlkat@katspace.org>
-rupa <rupa@lrrr.us> <rupa@lrrr.us>
-timthelion <tim.thelion@gmail.com>
-
-# for core only
-Neil Mitchell <http://www.cs.york.ac.uk/~ndm/>, Neil Mitchell
-Nick Burlett <nickburlett@mac.com>
-Sam Hughes   <hughes@rpi.edu>
-Shae Erisson <shae@ScannedInAvian.com>
-Conrad Irwin <conrad.irwin@gmail.com>
+sam-barr <mail@samf.bar> <samfbarr@outlook.com>
+slotThe <soliditsallgood@mailbox.org> <50166980+slotThe@users.noreply.github.com>
+slotThe <soliditsallgood@mailbox.org> <soliditsallgood@tuta.io>
+spoonm <spoonm@spoonm.org>