From 018d7bed2650d838fc2290b0aaf641ba2f6d5edf Mon Sep 17 00:00:00 2001 From: "willem.peerlinck@esko.com" Date: Thu, 15 Feb 2024 18:23:09 +0100 Subject: [PATCH] Revert "admin: Account for duplicate emails in the .mailmap (#4075)" This reverts commit e3e3dc3caa930efae588b4ed6d9046b5801f92c1. --- .mailmap | 70 -------------------------------------------------------- 1 file changed, 70 deletions(-) diff --git a/.mailmap b/.mailmap index 340ef3ab43..ea2b716934 100644 --- a/.mailmap +++ b/.mailmap @@ -1,71 +1 @@ -# This file establishes email equivalences so we can resolve what look like -# multiple authors, but actually are the same author who has used multiple -# emails over the course of their involvement with the project. -# -# The format is any of the following: -# -# CANONICAL-NAME -# CANONICAL-NAME alternate-name -# -# You can check for duplicates with this command: -# git shortlog -sne --all -# That command (and others) will use this file to collapse the duplicates. -# -# If you see any duplicates we don't account for here, or if you look at your -# own entry here and want a different name or email to be your canonical one -# (we may not have guessed correctly and matched your preferences), please -# file a PR with the edits to this file. - -Alejandro Conty aconty -Alejandro Conty Alejandro Conty -Anton Dukhovnikov Anton Dukhovnikov <131838425+antond-weta@users.noreply.github.com> -Brecht Van Lommel -Brecht Van Lommel Brecht Van Lommel -Brecht Van Lommel brechtvanlommel@gmail.com -Chris Kulla -Chris Kulla -Chris Kulla Christopher Kulla -Chris Kulla fpsunflower Claire Foster -Clément Champetier Clement Champetier -Clifford Stein Cliff Stein -Clifford Stein cmstein -Dan Wexler Dan Wexler -Dan Wexler Dan Wexler -Edgar Velazquez-Armendariz Edgar Velázquez-Armendáriz -Fabien Castan Fabien Castan -Fabien Servant <55734626+servantf@users.noreply.github.com> Fabien Servant @ TCS <100348063+servantftechnicolor@users.noreply.github.com> -Frédéric Devernay Frédéric Devernay -Harry Mallon Harry Mallon <1816667+hjmallon@users.noreply.github.com> -Henri Fousse darkhorse64 -Jesse Yurkovich Jesse Y -Larry Gritz -Larry Gritz lgritz -Leszek Godlewski Leszek Godlewski -lmarz lmarz <37630820+lmarz@users.noreply.github.com> -Mark Boorer Mark Boorer -Mark Boorer Shootfast -Mark Visser Mark Visser -Matteo F. Vescovi Matteo F. Vescovi -Matteo F. Vescovi Matteo F. Vescovi -Mikael Sundell Mikael Sundell -Nathan Rusch Nathan Rusch -Nick Black nick black -Nick Black Nick Black -Pascal Lecocq Pascal Lecocq -Ramon Montoya Ramon Montoya Vozmediano -Ramon Montoya rmv -Ray Molenkamp Ray Molenkamp -Richard M. Shaw Richard -Richard M. Shaw Richard Shaw -Robert Matusewicz matekm -Robert Matusewicz Robert -Roman Zulak marsupial -Sam Richards Sam Richards -Shane Ambler sambler -Shane Ambler SAmbler -Simon Boorer Simon Boorer -Thiago Ize Thiago Ize -Vlad (Kuzmin) Erium Vlad (Kuzmin) Erium -Will Rosecrans Will -Yang Yang YangYangTL