From 3b15c9155721cefe9bfe34211d9d4428a0ad1485 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde@gmail.com>
Date: Wed, 29 Apr 2020 17:23:34 +0200
Subject: [PATCH] Add .mailmap to merge authors with inconsistent names/emails

---
 .mailmap | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 .mailmap

diff --git a/.mailmap b/.mailmap
new file mode 100644
index 000000000..637602216
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,27 @@
+Andreas Haas <liu.gam3@gmail.com>
+Andrew Conrad <aconrad103@gmail.com>
+Andrii Doroshenko <xrayez@gmail.com>
+puchik <puchik@users.noreply.github.com> <48544263+puchik@users.noreply.github.com>
+Chris Bradfield <chris@kidscancode.org> <cb@scribe.net>
+clayjohn <claynjohn@gmail.com>
+clayjohn <claynjohn@gmail.com> <clayjohn@shaw.ca>
+corrigentia <coryan25@gmail.com> <20541985+corrigentia@users.noreply.github.com>
+Frido <f.schermutzki@gmail.com>
+Hugo Locurcio <hugo.locurcio@hugo.pro> <calinou@opmbx.org>
+Hugo Locurcio <hugo.locurcio@hugo.pro> <hugo.l@openmailbox.org>
+Ignacio Etcheverry <ignalfonsore@gmail.com> <neikeq@users.noreply.github.com>
+Julian Murgia <the.straton@gmail.com>
+Kelly Thomas <kelly.thomas@hotmail.com.au>
+Leon Krause <lk@leonkrause.com>
+Leon Krause <lk@leonkrause.com> <eska@eska.me>
+Max Hilbrunner <m.hilbrunner@gmail.com>
+Max Hilbrunner <m.hilbrunner@gmail.com> <mhilbrunner@users.noreply.github.com>pn
+Michael Alexsander <michaelalexsander@protonmail.com>
+Nathan Lovato <nathan@gdquest.com>
+Paul Joannon <hello@pauljoannon.com> <437025+paulloz@users.noreply.github.com>
+Rémi Verschelde <rverschelde@gmail.com> <remi@verschelde.fr>
+skyace65 <trekie96@hotmail.com>
+Will Nations <willnationsdev@gmail.com>
+Yuri Roubinsky <chaosus89@gmail.com>
+Yuri Sizov <pycbouh@users.noreply.github.com> <yuris@humnom.net>
+ZX-WT <ZX-WT@ymail.com> <ZX_WT@ymail.com>