From 5f27e130d8df77d3a888ee4e36f2c82d2668c50b Mon Sep 17 00:00:00 2001 From: Timo Tijhof Date: Thu, 14 Mar 2024 11:35:36 -0700 Subject: [PATCH] CREDITS: Fix various duplicates Follows-up I2f2e75d3fa42e8cf6de19a8fbb615. See mailmap for details, except: * Brent G was added for a pre-Git patch in Bugzilla http://mediawiki.org/wiki/Special:Code/MediaWiki/45468 https://bugzilla.wikimedia.org/show_bug.cgi?id=16720 Author: overlordq * OverlordQ was added based on their SVN commit handle. * vinithegit -> Vinitha based on more recent patches https://gerrit.wikimedia.org/r/q/owner:vinithacse%2540gmail.com https://gerrit.wikimedia.org/r/c/mediawiki/extensions/WikimediaEvents/+/408843/2//COMMIT_MSG Change-Id: I1e96d399793f2c409816b4676e517418cefa6cd8 --- .mailmap | 37 ++++++++++++++++++++++++++++++------- CREDITS | 25 ++++--------------------- 2 files changed, 34 insertions(+), 28 deletions(-) diff --git a/.mailmap b/.mailmap index 2763374c2cb..104e3984738 100644 --- a/.mailmap +++ b/.mailmap @@ -37,11 +37,15 @@ addshore Aditya Sastry Adrian Heine Alangi Derick +Alangi Derick +Alangi Derick +Alex Paskulin Alex Z. Aleksey Bekh-Ivanov Alexandre Emsenhuber Alexandre Emsenhuber Alexandre Emsenhuber +Alexander Mashin Alexander Monk Alexander Monk Alexander Monk @@ -57,7 +61,8 @@ Anders Wegge Jakobsen Andre Engels Andrew Garrett Andrew Garrett -Andrew Otto +Andrew Otto +Andrew Otto Angela Beesley Starling Antoine Musso Antoine Musso @@ -87,6 +92,7 @@ Bene Bene Benny Situ Benny Situ +Bernard Wang Bertrand Grondin Bill Pirkle Bill Pirkle @@ -94,6 +100,9 @@ Brad Jorsch Brad Jorsch Brandon Harris BrandonXLF +Brent Garber +Brent Garber +Brent Garber Brian Wolff Brian Wolff Brian Wolff @@ -125,11 +134,14 @@ Christoph Jauera Christoph Jauera Christopher Johnson church of emacs +Clara Andrew-Wani +Clara Andrew-Wani Cindy Cicalese Cindy Cicalese Cindy Cicalese ckoerner Conrad Irwin +Cyndy Simiyu Dan Duvall dan-nl Daniel A. R. Werner @@ -148,6 +160,7 @@ Danny B. Danny B. Darian Anthony Patrick Darkdragon09 +DatGuy David Barratt David Causse David Chan @@ -163,6 +176,7 @@ Diederik van Liere diesel kapasule Domas Mituzas Douglas Gardner +Doğu Abaris DPStokesNZ Dreamy Jazz Dreamy Jazz @@ -193,12 +207,14 @@ Florian Schmidt Fran Rogers Fran Rogers +Frances Goodwin freakolowsky Func FunPika Gabriel Wicke Gabriel Wicke Gabriel Wicke +gengh Geoffrey Mon Geoffrey Trang Gergő Tisza @@ -347,6 +363,9 @@ MrBlueSky MrBlueSky Mukunda Modell MZMcBride +Máté Szabó +Máté Szabó +Máté Szabó nadeesha Namit Nathan Larson @@ -365,7 +384,7 @@ Novem Linguae Nuria Ruiz Ori Livneh Ori Livneh -OverlordQ +Oskar Jauch Owen Davis Owen Davis paladox @@ -462,8 +481,10 @@ Siebrand Mazeland Siebrand Mazeland Siebrand Mazeland Siebrand Mazeland +Simone Cuomo Smriti Singh Sohom Datta +Sohom Datta Sorawee Porncharoenwase SQL ST47 @@ -494,17 +515,18 @@ Thiemo Kreuz This, that and the other tholam Thomas Bleher +Thomas Chin Thomas Dalton Thomas Gries Tim Landscheidt Tim Laqua Tim Starling Tim Starling -Timo Tijhof -Timo Tijhof -Timo Tijhof -Timo Tijhof -Timo Tijhof +Timo Tijhof +Timo Tijhof +Timo Tijhof +Timo Tijhof +Timo Tijhof Tina Johnson Tobi_406 Tom Maaswinkel @@ -527,6 +549,7 @@ Victor Vasiliev Victor Vasiliev Vlad Shapik Vikas S Yaligar +Vinitha Vivek Ghaisas Volker E wctaiwan diff --git a/CREDITS b/CREDITS index 91ea5bad624..93da0e92928 100644 --- a/CREDITS +++ b/CREDITS @@ -54,7 +54,6 @@ The following list can be found parsed under Special:Version/Credits --> * Alex Paskulin * Alex Shih-Han Lin * Alex Z. -* Alexander I. Mashin * Alexander Lehmann * Alexander Mashin * Alexander Monk @@ -100,7 +99,6 @@ The following list can be found parsed under Special:Version/Credits --> * Antoni Siek * Antonio Ospite * Anzx -* apaskulin * apasternak * apexkid * April King @@ -158,7 +156,6 @@ The following list can be found parsed under Special:Version/Credits --> * BrandonXLF * brendajerop * Brennen Bearnes -* Brent G * Brent Garber * Brian Wolff * Brianna Laugher @@ -166,7 +163,6 @@ The following list can be found parsed under Special:Version/Credits --> * Bryan Davis * Bryan Tong Minh * burthsceh -* bwang * C. Scott Ananian * Cacycle * Calak @@ -194,15 +190,13 @@ The following list can be found parsed under Special:Version/Credits --> * Cindy Cicalese * ckoerner * Clara Andrew-Wani -* clarakosi * Clare Ming * cobaltcigs * Cole White * Conrad Irwin * Cormac Parle * cryptocoryne -* csimiyu -* Cyndy +* Cyndy Simiyu * D3r1ck01 * Daimona Eaytoy * Dan Barrett @@ -227,7 +221,6 @@ The following list can be found parsed under Special:Version/Credits --> * Darian Anthony Patrick * Darkdragon09 * DaSch -* datguy * DatGuy * Dave Pifke * David Barratt @@ -257,7 +250,6 @@ The following list can be found parsed under Special:Version/Credits --> * divadsn * diwanshu885 * Dmitriy Sky -* Dogu * Doğu Abaris * Domas Mituzas * Douglas Gardner @@ -319,8 +311,8 @@ The following list can be found parsed under Special:Version/Credits --> * fomafix * Framawiki * Fran Rogers +* Frances Goodwin * Francois Pignon -* frankie * Fred Emmott * Func * FunPika @@ -431,7 +423,6 @@ The following list can be found parsed under Special:Version/Credits --> * Jeroen De Dauw * Jerome Jamnicky * Jesús Martínez Novo -* jhobs * Jiabao * Jidanni * Jimmy Collins @@ -704,10 +695,8 @@ The following list can be found parsed under Special:Version/Credits --> * Oren Held * Ori Livneh * osamaahmed17 -* oskar.jauch@gmail.com +* Oskar Jauch * Ostrzyciel -* Ottomata -* OverlordQ * Owen * Owen Davis * Paa Kwesi Imbeah @@ -873,9 +862,7 @@ The following list can be found parsed under Special:Version/Credits --> * Simon Stier * Simon Walker * Simone Cuomo -* Simone This Dot * Smriti Singh -* Sohom * Sohom Datta * Solitarius * Sorawee Porncharoenwase @@ -920,7 +907,6 @@ The following list can be found parsed under Special:Version/Credits --> * Taavi Väänänen * tacsipacsi * Tarquin -* TChin * TehKittyCat * TerraCodes * Thalia Chan @@ -948,8 +934,6 @@ The following list can be found parsed under Special:Version/Credits --> * Tina Johnson * Tisane * tjlsangria -* Tjones -* TK-999 * Tks4Fish * Tobi_406 * Tobias Gritschacher @@ -972,7 +956,6 @@ The following list can be found parsed under Special:Version/Credits --> * Ty Hopp * TyA * Tychay -* Tyler Anthony Romeo * Tyler Cipriani * Tyler Romeo * tzhelyazkova @@ -995,7 +978,7 @@ The following list can be found parsed under Special:Version/Credits --> * vidhi-mody * Ville Stadista * Vincent Privat -* vinithegit +* Vinitha * vishnu * Vitaliy Filippov * Vivek Ghaisas