Skip to content

Conversation

@dmsnell
Copy link
Member

@dmsnell dmsnell commented Oct 17, 2025

See WordPress/wordpress-develop#7180

There are numerous cases in this project where a single person has made commits with multiple unique identities. Sometimes this is due to configuration differences on new computers. Sometimes it’s because someone changes their email. Sometimes people change their names.

Their digital legacy follows them in git. This patch introduces a .mailmap file which provides the opportunity to remap names and email addresses across supporting tools to combine or rename those identities.

See git help mailmap.

This change only impacts how git tools display author identities. It includes no code or behavioral changes.

Diff from `git shortlog -sne` before and after this change
--- /var/folders/lv/12zyh9p565q7mmycrw6zqkvw0000gn/T//.psub.pQXi0o	2025-11-26 12:35:12
+++ /var/folders/lv/12zyh9p565q7mmycrw6zqkvw0000gn/T//.psub.od5dBd	2025-11-26 12:35:20
@@ -2,9 +2,8 @@
 1Aakash Verma <aakash.verma@rtcamp.com>
 1Aaree <843610+janusqa@users.noreply.github.com>
 2Aaron D. Campbell <aaron@AaronDCampbell.com>
-3Aaron Jorbin <aaron@jorb.in>
-9Aaron Jorbin <aaronjorbin@users.noreply.github.com>
-418Aaron Robertshaw <60436221+aaronrobertshaw@users.noreply.github.com>
+12Aaron Jorbin <jorbin@git.wordpress.org>
+418Aaron Robertshaw <aaronrobertshaw@git.wordpress.org>
 1Aaron Ware <aaron@linchpin.com>
 3Abdelmajid HAMDANI <abdel.hamdani213@gmail.com>
 1Abdullah Ramzan <abdullahmzm@gmail.com>
@@ -13,12 +12,9 @@
 2Abhishek Sharma <abhishek3.dev@gmail.com>
 3Adam Boro <adam@adamboro.com>
 2Adam Bosco <github@adambos.co>
-235Adam Silverstein <adam@10up.com>
-8Adam Silverstein <adam@earthbound.com>
-13Adam Silverstein <adamjs@google.com>
-9Adam Silverstein <adamsilverstein@earthboundhosting.com>
+265Adam Silverstein <adamsilverstein@git.wordpress.org>
 1Adam Tak <adam.tak2112@gmail.com>
-228Adam Zielinski <adam@adamziel.com>
+228Adam Zieliński <zieladam@git.wordpress.org>
 1adambasa-dp <96129284+adambasa-dp@users.noreply.github.com>
 87Addison Stavlo <Stavz01@gmail.com>
 1Aditya Shah <117928403+aditya241104@users.noreply.github.com>
@@ -38,7 +34,7 @@
 1AJOTKA <a.j.dobrowolska@gmail.com>
 2Akanshu Singh <61490175+singhakanshu00@users.noreply.github.com>
 1Akash Dhawade <96809924+akashdhawade2005@users.noreply.github.com>
-881Aki Hamano <54422211+t-hamano@users.noreply.github.com>
+895Aki Hamano <wildworks@git.wordpress.org>
 16Akira Tachibana <atachibana@unofficialtokyo.com>
 6Akshat Kakkad <87222220+AKSHAT2802@users.noreply.github.com>
 1Akshay S Dinesh <asdofindia@gmail.com>
@@ -64,14 +60,11 @@
 1Alex Florisca <alex.florisca@automattic.com>
 1Alex Kirk <akirk@users.noreply.github.com>
 1Alex Kozack <cawa-93@users.noreply.github.com>
-47Alex Lende <ajlende@gmail.com>
-40Alex Lende <alex@lende.xyz>
-34Alex Lende <alex+github.com@lende.xyz>
+121Alex Lende <ajlende@git.wordpress.org>
 2Alex Sanford <alex.sanford1@gmail.com>
 52Alex Stine <alex.stine@yourtechadvisors.com>
 11Alex Woollam <alexjhwoollam@gmail.com>
-113Alexander Botteram <alexander@yoast.com>
-10Alexander Botteram <Xyfi@users.noreply.github.com>
+123Alexander Botteram <xyfi@git.wordpress.org>
 3Alexandra Nyitraiova <alexandranyitraiova@gmail.com>
 1Alexandre Buffet <43843473+alexandrebuffet@users.noreply.github.com>
 1Alexandre D'Eschambeault <xel1045@gmail.com>
@@ -91,29 +84,19 @@
     33Amit Raj <77401999+amitraj2203@users.noreply.github.com>
      1Amogh Harish <amoghharish871@gmail.com>
      1Amr Gawish <amr.gawish@gmail.com>
-     3André (On Vacation) <583546+oandregal@users.noreply.github.com>
-   440André <583546+oandregal@users.noreply.github.com>
-     3André <andres.maneiro@automattic.com>
-   106André <nosolosw@users.noreply.github.com>
+   758André Maneiro <oandregal@git.wordpress.org>
      2André Philip Kallehauge <andrekallehauge@gmail.com>
-   404Andrea Fercia <a.fercia@gmail.com>
+   404Andrea Fercia <afercia@git.wordpress.org>
      2Andrea Roenning <andreawetzel@users.noreply.github.com>
      1andreamiddleton <2285933+andreamiddleton@users.noreply.github.com>
      1Andrei Băicuș <baicusandrei@me.com>
-     7andrei draganescu <andrei.draganescu@automattic.com>
-     4Andrei Draganescu <andrei.draganescu@automattic.com>
-    87andrei draganescu <me@andreidraganescu.info>
-   128Andrei Draganescu <me@andreidraganescu.info>
+   226Andrei Draganescu <andraganescu@git.wordpress.org>
      1Andrei Glingeanu <andrei.glingeanu@gmail.com>
      3Andrei Lupu <euthelup@gmail.com>
      2Andrei Surdu <smartik89@gmail.com>
-     9Andrés <andres.maneiro@automattic.com>
      1Andres <andres@netzstrategen.com>
-   143Andrés <nosolosw@users.noreply.github.com>
      1Andrew DePaula <39636957+voyager131@users.noreply.github.com>
-    37Andrew Duthie <1779930+aduth@users.noreply.github.com>
-   381Andrew Duthie <aduthie7@gmail.com>
-  1363Andrew Duthie <andrew@andrewduthie.com>
+  1781Andrew Duthie <aduth@git.wordpress.org>
      1Andrew Fair <39407887+websitegenii@users.noreply.github.com>
      1Andrew Fleming <andrew.fleming@automattic.com>
     32Andrew Hayward <andrew.hayward@automattic.com>
@@ -122,11 +105,9 @@
      1Andrew Matthews <andrewpmatthews@outlook.com>
     12Andrew Munro <andrew@amdrew.com>
      1Andrew Nevins <andrew.nevins.misc@gmail.com>
-     3Andrew Ozz <743931+azaozz@users.noreply.github.com>
-     8Andrew Ozz <azaozz@users.noreply.github.com>
+    11Andrew Ozz <azaozz@git.wordpress.org>
      2Andrew Roberts <andrew.roberts@ephox.com>
-   319Andrew Serong <14988353+andrewserong@users.noreply.github.com>
-     1Andrew Serong <andrewserong@gmail.com>
+   320Andrew Serong <andrewserong@git.wordpress.org>
      1Andrey <andreyc0d3r@gmail.com>
      2Andy Fragen <andy@thefragens.com>
     27Andy Peatling <apeatling@users.noreply.github.com>
@@ -165,10 +146,7 @@
      1ArnaudBan <abanvillet@studio-goliath.com>
      1Arslan Ahmed <56331609+akkspros@users.noreply.github.com>
      1Arslan Kalwar <56331609+akkspros@users.noreply.github.com>
-    33Artemio Morales <artemio.morales@a8c.com>
-     1Artemio Morales <artemio@altsalt.com>
-     2Artemio Morales <ra.morales244@gmail.com>
-     3Artemio Morales <ric.morales22@gmail.com>
+    39Artemio Morales <artemiosans@git.wordpress.org>
     17arthur791004 <arthur.chu@automattic.com>
      1arthur791004 <arthur791004@gmail.com>
      1Artur Grabowski <75754543+arturgrabo@users.noreply.github.com>
@@ -197,7 +175,7 @@
      1Basti Becker <bastibeckr@users.noreply.github.com>
     45BE-Webdesign <cromleyedwin89@gmail.com>
      2Bec Scott <bec@belfryimages.com.au>
-   342Ben Dwyer <ben@scruffian.com>
+   344Ben Dwyer <scruffian@git.wordpress.org>
      1Ben Greeley <bengreeley@users.noreply.github.com>
      1Ben Harris <ben@tilde.team>
      2Ben Keith <1754187+benlk@users.noreply.github.com>
@@ -214,8 +192,7 @@
      3Benoît Chantre <mail@benoitchantre.com>
      1benridane <15902112+benridane@users.noreply.github.com>
      1Bernhard Kau <github@kau-boys.de>
-    90Bernie Reiter <96308+ockham@users.noreply.github.com>
-   160Bernie Reiter <ockham@raz.or.at>
+   250Bernie Reiter <bernhard-reiter@git.wordpress.org>
      1Bhanu <bhanu@krenovate.com>
      1Bhavik Kalpesh <53536925+bhavz-10@users.noreply.github.com>
      1Bill Columbia <hello@billcolumbia.com>
@@ -267,8 +244,7 @@
     33Carlos Bravo <37012961+cbravobernal@users.noreply.github.com>
      1Carlos Galarza <carloslfu@gmail.com>
    229Carlos Garcia <fluiddot@gmail.com>
-    33Carolina Nymark <hi@themesbycarolina.com>
-   162Carolina Nymark <myazalea@hotmail.com>
+   195Carolina Nymark <poena@git.wordpress.org>
      1Carsten Bach <mail@carsten-bach.de>
     51Ceyhun Ozugur <ceyhunozugur@gmail.com>
     39Chad Chadbourne <13856531+chad1008@users.noreply.github.com>
@@ -348,8 +324,7 @@
      1Daniel Horton-Wellings <danielhortonwellings@gmail.com>
      1Daniel James <danieltj27@users.noreply.github.com>
      2Daniel L. Iser <daniel@code-atlantic.com>
-    67Daniel Richards <daniel.p.richards@gmail.com>
-   618Daniel Richards <daniel.richards@automattic.com>
+   685Daniel Richards <talldanwp@git.wordpress.org>
      1Daniel Schutzsmith <daniel@schutzsmith.com>
      3Daniel Walmsley <goldsounds@gmail.com>
     28Danilo Ercoli <ercoli@gmail.com>
@@ -362,22 +337,20 @@
      2Dave Moran <dave.moran118@gmail.com>
      1Dave Page <dave_pageca@yahoo.ca>
      1Dave Parker <dave@redkey.io>
-   460Dave Smith <getdavemail@gmail.com>
      9Dave Whitley <drw158@gmail.com>
      1David Aguilera <david.aguilera@neliosoftware.com>
      3David Aguilera <dvd1985@gmail.com>
      3David Arenas <darensr@gmail.com>
    101David Arenas <david.arenas@automattic.com>
      2David Biňovec <david.binovec@gmail.com>
-    67David Calhoun <438664+dcalhoun@users.noreply.github.com>
-    12David Calhoun <dpcalhoun@gmail.com>
-    76David Calhoun <github@davidcalhoun.me>
+   155David Calhoun <dpcalhoun@git.wordpress.org>
      1David Gwyer <dgwyer@users.noreply.github.com>
      2David Herrera <mail@dlh01.info>
      1David Page <dave_pageca@yahoo.ca>
      1David Paul Ellenwood <davee@tri.be>
      2David Rozando <david.rozando@gmail.com>
      5David Ryan <0aveRyan@users.noreply.github.com>
+   460David Smith <get_dave@git.wordpress.org>
      1David Sword <david@davidsword.ca>
    104Dávid Szabó <david.szabo97@gmail.com>
      1Davis Shaver <davisshaver@gmail.com>
@@ -388,7 +361,7 @@
      1Deepak Mahendrakar <dpkm95@gmail.com>
      6Delowar Hossain <delowardev@gmail.com>
      2Denis Žoljom <dingo-d@users.noreply.github.com>
-   110Dennis Snell <dennis.snell@automattic.com>
+   112Dennis Snell <dmsnell@git.wordpress.org>
    229dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
     45Derek Blank <derekpblank@gmail.com>
     22Derek Sifford <dereksifford@gmail.com>
@@ -435,16 +408,7 @@
      1ElectricFeet <ElectricFeet@users.noreply.github.com>
      4Eliezer Peña <52340161+EliezerSPP@users.noreply.github.com>
      5Elio Rivero <eliorivero@gmail.com>
-   421Ella <4710635+ellatrix@users.noreply.github.com>
-   112Ella <ella@iseulde.com>
-     2Ella Iseulde Van Dorpe <ella@iseulde.com>
-     6Ella van Durpe <ella@vandurpe.com>
-   119Ella Van Dorpe <iseulde@automattic.com>
-   158Ella van Durpe <4710635+ellatrix@users.noreply.github.com>
-     4Ella van Durpe <ella@vandurpe.com>
-    37Ella van Durpe <iseulde@automattic.com>
-    24Ella Van Durpe <iseulde@automattic.com>
-   466Ella van Durpe <wp@iseulde.com>
+  1635Ella van Durpe <ellatrix@git.wordpress.org>
      1Emerson "Duke" Almeida <emersonalmeidax@gmail.com>
      1Emilio Martinez <e.marticor@gmail.com>
      1Emir Ugljanin <emirugljanin@gmail.com>
@@ -520,10 +484,9 @@
     19George Hotelling <george.hotelling@automattic.com>
     15George Hotelling <george@hotelling.net>
      1George Karakostas <gckarakostas@gmail.com>
-  1492George Mamadashvili <georgemamadashvili@gmail.com>
+  1492George Mamadashvili <mamaduka@git.wordpress.org>
      2George Stephanis <daljo628@gmail.com>
-   265Gerardo Pacheco <gerardo.pacheco@automattic.com>
-     2Gerardo Pacheco <gerardo.sicart@gmail.com>
+   267Gerardo Pacheco <geriux@git.wordpress.org>
      7Gio Lodi <gio@mokacoding.com>
      1Gio Lodi <giovanni.lodi42@gmail.com>
      1GitDown Jambersaw <rtro92@users.noreply.github.com>
@@ -534,12 +497,8 @@
      3Greg Rickaby <greg@gregrickaby.com>
      1Greg Ross <greg@toolstack.com>
      1Greg Sullivan <greg@swivelbase.com>
-   384Greg Ziółkowski <grzegorz@gziolo.pl>
-    14Grzegorz (Greg) Ziółkowski <grzegorz.ziolkowski@automattic.com>
-   427Grzegorz (Greg) Ziółkowski <grzegorz@gziolo.pl>
+  1129Grzegorz (Greg) Ziółkowski <gziolo@git.wordpress.org>
     14Grzegorz <niebadz@gmail.com>
-   291Grzegorz Ziolkowski <grzegorz@gziolo.pl>
-    13Grzegorz Ziółkowski <grzegorz@gziolo.pl>
      4Guido Scialfa <dev@guidoscialfa.com>
      1Gulamdastgir-Momin <156418087+Gulamdastgir-Momin@users.noreply.github.com>
      1Gustavo Bordoni <bordoni.dev@gmail.com>
@@ -556,8 +515,8 @@
      1Hasnain Ashfaq <HasnainAshfaq@users.noreply.github.com>
      5haunzala <59374562+hz-tyfoon@users.noreply.github.com>
     55Haz <hazdiego@gmail.com>
-    49Héctor <27339341+priethor@users.noreply.github.com>
      1Hector Jarquin <hectorjarquin@outlook.com>
+    51Héctor Prieto <preithor@git.wordpress.org>
      1Heiko Lübbe <github@heikol.de>
      1Helen Hou-Sandi <helen.y.hou@gmail.com>
      6Hendrik Luehrsen <Luehrsen@users.noreply.github.com>
@@ -605,8 +564,7 @@
      1Ipstenu (Mika Epstein) <Ipstenu@users.noreply.github.com>
      9Irene <irene@yoast.com>
      6IreneStr <irene@yoast.com>
-   283iseulde <ella@iseulde.com>
-     3iseulde <wp@iseulde.com>
+   339Isabel Brison <isabel_brison@git.wordpress.org>
      1Ismael Martín Alabarce <info@ismaeld.com>
      1Israel Shmueli <bpottery@gmail.com>
      3Iulia Cazan <iulia@phpcoder.ro>
@@ -627,9 +585,9 @@
      1Jake Spurlock <whyisjake@gmail.com>
     32James <james.johnson@ephox.com>
    264James Johnson <james.johnson@ephox.com>
-   297James Koster <james@jameskoster.co.uk>
+   297James Koster <jameskoster@git.wordpress.org>
      5James Newell <jameslnewell@users.noreply.github.com>
-   157James Nylen <jnylen@gmail.com>
+   157James Nylen <jnylen0@git.wordpress.org>
      1James Stine <leon.blade@gmail.com>
      1James Tryon <james@easilyamusedinc.com>
      1Jamie Halvorson <jamie@halvorson.co.uk>
@@ -640,10 +598,9 @@
      1jankimoradiya <janki.moradiya@gmail.com>
      7Janvo Aldred <scorpitar@gmail.com>
      5Janw Oostendorp <webmaster@janw.me>
-   311Jarda Snajdr <jsnajdr@gmail.com>
+   311Jarda Snajdr <jsnajdr@git.wordpress.org>
      1Jarkko Saltiola <jarkko.saltiola@gmail.com>
      1Jarred Kennedy <JarredKennedy@users.noreply.github.com>
-     3jasmussen <joen@automattic.com>
      1Jason Agnew <j@agnew.co>
      2Jason Agnew <jason@bigbitecreative.com>
      5Jason Caldwell <jas@src.works>
@@ -712,11 +669,7 @@
      1Joe McGill <joemcgill@humanmade.com>
     34Joel Dean <jdeanjj1000@gmail.com>
      1Joel Thiessen <444632+joelclimbsthings@users.noreply.github.com>
-   509Joen A <1204802+jasmussen@users.noreply.github.com>
-    34Joen A. <1204802+jasmussen@users.noreply.github.com>
-     7Joen Asmussen <1204802+jasmussen@users.noreply.github.com>
-   209Joen Asmussen <asmussen@gmail.com>
-   749Joen Asmussen <joen@automattic.com>
+  1511Joen Asmussen <joen@git.wordpress.org>
     31John <johng75@gmail.com>
     39John Blackbourn <johnbillion@gmail.com>
      1John David Griffin <25410446+griffinjohndavid@users.noreply.github.com>
@@ -728,18 +681,13 @@
 7John Watkins <johnwatkins0@gmail.com>
 5johnwatkins0 <johnwatkins0@gmail.com>
 1jomurgel <jomurgel@users.noreply.github.com>
-26Jon Desrosiers <desrosj@users.noreply.github.com>
-2Jon Q <hello@jonquach.com>
-41Jon Quach <hello@jonquach.com>
-67Jon Surrell <jon.surrell@automattic.com>
-111Jon Surrell <sirreal@users.noreply.github.com>
+178Jon Surrell <jonsurrell@git.wordpress.org>
 1Jonah Tan <47470981+jonahtanjz@users.noreply.github.com>
 1Jonathan <97595959+J0n-92@users.noreply.github.com>
 2Jonathan Belcher <jonathan.belcher@automattic.com>
 5Jonathan Bossenger <jonathanbossenger@gmail.com>
 1Jonathan Champ <jrchamp@ncsu.edu>
-20Jonathan Desrosiers <359867+desrosj@users.noreply.github.com>
-12Jonathan Desrosiers <desrosj@users.noreply.github.com>
+58Jonathan Desrosiers <desrosj@git.wordpress.org>
 2Jonathan Goldford <jonathan@wiredimpact.com>
 1Jonathan Wold <jonathan.wold@xwp.co>
 7Joni Erkkilä <62872075+n2erjo00@users.noreply.github.com>
@@ -748,12 +696,10 @@
 1Jordan Harband <ljharb@gmail.com>
 4jordesign <jordan.gillman@automattic.com>
 2jordesign <jordan@jordesign.com>
-337Jorge <jorge.costa@developer.pt>
 13Jorge Bernal <jbernal@gmail.com>
 17Jorge Bernal <jorge@automattic.com>
 1Jorge Contreras <contact@jorgecontreras.dev>
-331Jorge Costa <jorge.costa@automattic.com>
-584Jorge Costa <jorge.costa@developer.pt>
+1252Jorge Costa <jorgefilipecosta@git.wordpress.org>
 1JorgeVilchez95 <99050272+JorgeVilchez95@users.noreply.github.com>
 1jornp <75777864+jornp@users.noreply.github.com>
 10Jos <jostnes@users.noreply.github.com>
@@ -789,7 +735,7 @@
 1Juzar Bharmal <53657281+Juzar10@users.noreply.github.com>
 1Jyotirmoy Roy <jyotirmoyroy649@gmail.com>
 4K Adam White <kadamwhite@users.noreply.github.com>
-273Kai Hao <kevin830726@gmail.com>
+273Kai Hao <kevin940726@git.wordpress.org>
 1Kamata Ryo <kamataryo@users.noreply.github.com>
 1Kapil Paul <kapilpaul007@gmail.com>
 6Karol Gorski <naerriel@gmail.com>
@@ -858,7 +804,7 @@
 2Lee Pak <159242502+leemyongpakva@users.noreply.github.com>
 3Lee Willis <lee@leewillis.co.uk>
 1Leemy Pakvn <3759923+leemyongpakvn@users.noreply.github.com>
-425Lena Morita <lena@jaguchi.com>
+426Lena Morita <0mirka00@git.wordpress.org>
 1Léo Muniz <leomuniz.primos@gmail.com>
 2Leo Postovoit <musicman5821@gmail.com>
 1leutrimhusaj <leutrim16husaj@hotmail.de>
@@ -916,20 +862,18 @@
 1Marcin Pietrzak <github@iworks.pl>
 2Márcio Duarte <1451087+pagelab@users.noreply.github.com>
 1Marco <studio@marcoangeli.net>
-446Marco Ciampini <marco.ciampo@gmail.com>
+446Marco Ciampini <mciampini@git.wordpress.org>
 3Marco Enrico <mvalviar@gmail.com>
 1Marco Fernandes <marcofernandes75@gmail.com>
 1Marco Pereirinha <pereirinha@users.noreply.github.com>
 3Marco Zehe <MarcoZehe@users.noreply.github.com>
-404Marcus Kazmierczak <marcus@mkaz.com>
+404Marcus Kazmierczak <mkaz@git.wordpress.org>
 3Marek Dědič <developer@dedic.eu>
 13Marek Hrabe <marekhrabe@me.com>
 10margolisj <1588194+margolisj@users.noreply.github.com>
 1Marie Comet <mariecomet666@gmail.com>
 1Marie Comet <mcomet@beapi.fr>
-678Marin Atanasov <8436925+tyxla@users.noreply.github.com>
-1Marin Atanasov <tyxla@abv.bg>
-1Marin Atanasov <tyxla@users.noreply.github.com>
+680Marin Atanasov <tyxla@git.wordpress.org>
 120Mario Santos <34552881+SantosGuillamot@users.noreply.github.com>
 1Marissa <85708316+marissa-makes@users.noreply.github.com>
 2Marius L. Jensen <468735+Clorith@users.noreply.github.com>
@@ -955,8 +899,7 @@
 3Mathiu <webmaster.emati@gmail.com>
 110Matias Benedetto <matias.benedetto@gmail.com>
 1Matías Surdi <matiassurdi@gmail.com>
-272Matias Ventura <mv@matiasventura.com>
-86Matías Ventura <mv@matiasventura.com>
+358Matías Ventura <mtias@git.wordpress.org>
 2Matt <146485480+mattrwalker@users.noreply.github.com>
 19Matt Chowning <matt.chowning@automattic.com>
 28Matt Chowning <mchowning@gmail.com>
@@ -989,7 +932,6 @@
 19Mayank Tripathi <70465598+Mayank-Tripathi32@users.noreply.github.com>
 2Mayuko Moriyama <mayuko.jpn@gmail.com>
 1Mayur Prajapati <91679132+mayurprajapatii@users.noreply.github.com>
-2mcsf <miguelcsf@gmail.com>
 1Md Aminul Islam <56115259+theaminuli@users.noreply.github.com>
 1meetjey <meetjey@users.noreply.github.com>
 5megane9988 <info@m-g-n.me>
@@ -1014,8 +956,7 @@
 3Michal Iwanow <4765119+mcliwanow@users.noreply.github.com>
 2MichalKarbownik <32970109+MichalKarbownik@users.noreply.github.com>
 1Micheal Harker <micheal@michealharker.com>
-41Miguel Fonseca <150562+mcsf@users.noreply.github.com>
-227Miguel Fonseca <miguelcsf@gmail.com>
+270Miguel Fonseca <mcsf@git.wordpress.org>
 2Miguel Lezama <lezama@gmail.com>
 7Miguel Torres <miguel.torres@automattic.com>
 11Miguel Torres <miguelmariatorresrojas@gmail.com>
@@ -1043,7 +984,6 @@
 2Miles Elliott <milesdelliott@users.noreply.github.com>
 8mimi <mimitips@gmail.com>
 4Minal Diwan <38693713+theminaldiwan@users.noreply.github.com>
-1mirka <lena@jaguchi.com>
 1Mirosław Filipiak <struna@struna.org>
 120Mitchell Austin <mr.fye@oneandthesame.net>
 6mitogh <mitogh@gmail.com>
@@ -1091,10 +1031,7 @@
 1Nguyễn Minh Khôi <10395311+khoipro@users.noreply.github.com>
 1Nicholas Tillman <truth1717@gmail.com>
 1Nick Cernis <nick@cern.is>
-59Nick Diego <ndiego@outermost.co>
-1Nick Diego <ndiego@outermostdesign.com>
-81Nick Diego <nick.diego@automattic.com>
-1Nick Diego <nickmdiego@gmail.com>
+142Nick Diego <ndiego@git.wordpress.org>
 1Nick Galvez <nicholas.galvez@gmail.com>
 1Nicky Lim <nickylimjj.nl@gmail.com>
 134Nicola Heald <nicola@notnowlewis.com>
@@ -1102,7 +1039,7 @@
 1Nicolas Juen <njuen87@gmail.com>
 1Nidhi Dhandhukiya <84835782+NidhiDhandhukiya74@users.noreply.github.com>
 3Niels Lange <info@nielslange.de>
-749Nik Tsekouras <ntsekouras@outlook.com>
+767Nik Tsekouras <ntsekouras@git.wordpress.org>
 1Nikhil Chavan <email@nikhilchavan.com>
 1Nikita <nkdevinfo@gmail.com>
 2Niklas P <niklasp@users.noreply.github.com>
@@ -1114,8 +1051,6 @@
 1Nitish Kaila <kailanitish90@gmail.com>
 122Noah Allen <noahtallen@gmail.com>
 3Noah Shrader <noahshrader@gmail.com>
-18ntsekouras <ntsekouras@outlook.com>
-54O André <nosolosw@users.noreply.github.com>
 17Oguz Kocer <oguzkocer@users.noreply.github.com>
 1okawayasuno <56523933+okawayasuno@users.noreply.github.com>
 7okmttdhr, tada <okmttdhr@users.noreply.github.com>
@@ -1133,9 +1068,7 @@
 1paolopiaggio <paolo.piaggesi@gmail.com>
 1Paresh Radadiya <pareshradadiya@hotmail.com>
 1Parikshit Adhikari <148355925+parikshit-adhikari@users.noreply.github.com>
-14Pascal Birchler <hello@pascalbirchler.ch>
-35Pascal Birchler <pascal.birchler@gmail.com>
-60Pascal Birchler <pascalb@google.com>
+109Pascal Birchler <swisspidy@git.wordpress.org>
 1Patricia Hillebrandt <patriciahillebrandt@gmail.com>
 1Patrick Boehner <patrick@patrickboehner.com>
 1Patrick Lindsay <patrick@yamasolutions.com>
@@ -1163,8 +1096,7 @@
 1Peter Petrov <peter.petrov89@gmail.com>
 1Peter Tasker <tasker82@gmail.com>
 3Peter Vogel <pvogel2@freenet.de>
-40Peter Wilson <519727+peterwilsoncc@users.noreply.github.com>
-4Peter Wilson <peterwilsoncc@users.noreply.github.com>
+44Peter Wilson <peterwilsoncc@git.wordpress.org>
 1Petros Paraskevopoulos <petros.g.paraskevopoulos@gmail.com>
 116Petter Walbø Johnsgård <petter@dekode.no>
 1PG Lewis <pglewis13@gmail.com>
@@ -1201,9 +1133,8 @@
 1Pratik K. Yadav <45303921+pratikkry@users.noreply.github.com>
 1Pratik Kumar <pratikthink@gmail.com>
 2Presskopp <cherrmann@gmx.de>
-2priethor <27339341+priethor@users.noreply.github.com>
 1properlypurple <40858144+properlypurple@users.noreply.github.com>
-44Q <hello@jonquach.com>
+87Q <itsjonq@git.wordpress.org>
 3Quintis1212 <34488718+Quintis1212@users.noreply.github.com>
 2Raaj Trambadia <raaj@raajtram.com>
 1Rachel Baker <rachel@rachelbaker.me>
@@ -1226,7 +1157,7 @@
 5Rami Yushuvaev <r_a_m_i@hotmail.com>
 1ramizmanked <ramiz.manked@gmail.com>
 25Ramon <Rahmon@users.noreply.github.com>
-484Ramon <ramonjd@users.noreply.github.com>
+484Ramon <ramonopoly@git.wordpress.org>
 1Ramon Ahnert <Rahmon@users.noreply.github.com>
 1ramonjd <ramonjd@gmail.com>
 1Randhir <98376250+randhirexpresstech@users.noreply.github.com>
@@ -1242,10 +1173,9 @@
 1Ren <18050944+renintw@users.noreply.github.com>
 8Renatho De Carli Rosa <renatho@gmail.com>
 1Renato Augusto Gama dos Santos <renato_0603@hotmail.com>
-2667Riad Benguella <benguella@gmail.com>
+2667Riad Benguella <youknowriad@git.wordpress.org>
 1Rich Collier <rcoll@users.noreply.github.com>
-2Rich Tabor <hello@themebeans.com>
-195Rich Tabor <hi@richtabor.com>
+197Rich Tabor <richtabor@git.wordpress.org>
 2Richard Ortiz <rcrd.ortiz@gmail.com>
 2Richie Carey <richiecarey@gmail.com>
 1Riddhi <riddhi.multidots@gmail.com>
@@ -1261,8 +1191,7 @@
 1rithik56 <70520896+rithik56@users.noreply.github.com>
 2Ritoban Dutta <124308320+ritoban23@users.noreply.github.com>
 1Rob Scott <robin.scott@silicondales.com>
-1Robert Anderson <noisysocks@users.noreply.github.com>
-534Robert Anderson <robert@noisysocks.com>
+535Robert Anderson <noisysocks@git.wordpress.org>
 2Robert DeVore <deviodigital@gmail.com>
 1Robert Lee <rslee1247@gmail.com>
 1Robert O'Rourke <rob@humanmade.com>
@@ -1293,9 +1222,7 @@
      1Rudy Susanto <email@rsusanto.com>
      9Ryan Kienstra <kienstraryan@gmail.com>
      3Ryan McCue <me@ryanmccue.info>
-    66Ryan Welcher <me@ryanwelcher.com>
-     8Ryan Welcher <ryan.welcher@10up.com>
-    15Ryan Welcher <ryan.welcher@automattic.com>
+    89Ryan Welcher <welcher@git.wordpress.org>
      1Ryo Utsunomiya <millionsnowliving@gmail.com>
      1Sabbir Ahmed <sabbir.081070@gmail.com>
      1Sabrina Zeidan <sabrinazeidan@gmail.com>
@@ -1321,13 +1248,9 @@
      1Santiago Cerro López <sacerro@gmail.com>
      1Sanzeeb Aryal <sanzeeb.aryal@gmail.com>
      1Sara Cope <sara.cope@gsa.gov>
-    20Sara Marcondes <saram@fastmail.com>
+   165Sara Marcondes <sarayourfriend@git.wordpress.org>
     16sarah ✈ semark <sarah@triggersandsparks.com>
-    47Sarah Norris <1645628+mikachan@users.noreply.github.com>
-    24Sarah Norris <sarah@sekai.co.uk>
-    83sarayourfriend <24264157+sarayourfriend@users.noreply.github.com>
-    10sarayourfriend <saram@fastmail.com>
-    52sarayourfriend <sarayourfriend@fastmail.com>
+    71Sarah Norris <mikachan@git.wordpress.org>
      9Sarthak Nagoshe <83178197+sarthaknagoshe2002@users.noreply.github.com>
      1Sathiya Venkatesan <sathiya@automattic.com>
      1Saulius Vikerta <saulius.vikerta@gmail.com>
@@ -1336,7 +1259,6 @@
      1sc81 <47123769+sc81@users.noreply.github.com>
      1sc81 <slawekczernikowski@gmail.com>
      1Scott Weaver <scottmweaver@gmail.com>
-     2scruffian <ben@scruffian.com>
      1Sean Fisher <srtfisher@gmail.com>
      1SeanMcMillan <reaper@umich.edu>
      1Sébastien SERRE <sebastien@thivinfo.com>
@@ -1377,8 +1299,7 @@
      2Simon <10352679+simonhammes@users.noreply.github.com>
      4Simon Hammes <simonhammes.27@gmail.com>
      2Simon Olofsson <simon@olofsson.de>
-    69Siobhan Bamber <siobhan@automattic.com>
-    14Siobhan Bamber <SiobhyB@users.noreply.github.com>
+    83Siobhan Bamber <siobhyb@git.wordpress.org>
      2SirLouen <sir.louen@gmail.com>
      1Sjoerd Boerrigter <sjoerd@trendwerk.nl>
      1skierpage <info@skierpage.com>
@@ -1386,10 +1307,7 @@
      4Sneha Patil <90276347+snehapatil2001@users.noreply.github.com>
      2Sofia Sousa <sofia@front.no>
      1Sohail khan <62786136+byteninjaa0@users.noreply.github.com>
-     6Sören Wrede <Soeren.Wrede@parshipgroup.com>
-    11Sören Wrede <soerenwrede@gmail.com>
-   186Sören Wrede <soerenwrede@gmail.com>
-     7Sören Wünsch <soerenwrede@gmail.com>
+   210Sören Wünsch <soean@git.wordpress.org>
      3Sourav Pahwa <70853906+Sourav61@users.noreply.github.com>
      1Spencer Williams <spencer@aninternetpresence.net>
      1ssergei <ssergei@gmail.com>
@@ -1424,8 +1342,7 @@
      5Takashi Kitajima <inc@2inc.org>
      2Takayuki Miyauchi <miya0001@users.noreply.github.com>
      2Takshil Kunadia <71006004+Takshil-Kunadia@users.noreply.github.com>
-    43Tammie Lister <karmatosed@gmail.com>
-    66Tammie Lister <tammie@automattic.com>
+   109Tammie Lister <karmatosed@git.wordpress.org>
      7Tanner Stokes <tanner.stokes@automattic.com>
      1Tanner Stokes <tanner@tannr.com>
      1tara king <tara.r.king@gmail.com>
@@ -1434,14 +1351,10 @@
      1tdesero <55186404+tdesero@users.noreply.github.com>
      1TeBenachi <TeBenachi@gmail.com>
      3Technote <technote.space@gmail.com>
-    22tellthemachines <isabel@tellthemachines.com>
-   317tellthemachines <tellthemachines@users.noreply.github.com>
      5tellyworth <alex@automattic.com>
      6Teresa Gobble <teresa.gobble@wpengine.com>
      1Teresa Gobble <teresagobble@gmail.com>
      1Terri Ann <terri.ann.s@gmail.com>
-     2Tetsuaki Hamano / 浜野 哲明 <54422211+t-hamano@users.noreply.github.com>
-    12Tetsuaki Hamano <54422211+t-hamano@users.noreply.github.com>
      5tfrommen <info@tfrommen.de>
     11tg-ephox <30682649+tg-ephox@users.noreply.github.com>
      1tharsheblows <jjjay@mac.com>
@@ -1537,9 +1450,7 @@
      1Walter Ebert <walterebert@users.noreply.github.com>
      2WebPraktikos <hi@webpraktikos.com>
      1Wendy Chen <jaewchen@gmail.com>
-     8Weston Ruter <weston@ruter.net>
-    91Weston Ruter <weston@xwp.co>
-    25Weston Ruter <westonruter@google.com>
+   124Weston Ruter <westonruter@git.wordpress.org>
      6Will Skora <skorasaurus@gmail.com>
      1Willem Prins <willem@somtijds.nl>
     24William Earnhardt <wearnhardt@gmail.com>

@dmsnell dmsnell added the [Type] Build Tooling Issues or PRs related to build tooling label Oct 17, 2025
@github-actions
Copy link

github-actions bot commented Oct 17, 2025

The following accounts have interacted with this PR and/or linked issues. I will continue to update these lists as activity occurs. You can also manually ask me to refresh this list by adding the props-bot label.

If you're merging code through a pull request on GitHub, copy and paste the following into the bottom of the merge commit message.

Co-authored-by: dmsnell <dmsnell@git.wordpress.org>
Co-authored-by: Mamaduka <mamaduka@git.wordpress.org>
Co-authored-by: ajlende <ajlende@git.wordpress.org>
Co-authored-by: desrosj <desrosj@git.wordpress.org>

To understand the WordPress project's expectations around crediting contributors, please review the Contributor Attribution page in the Core Handbook.

@github-actions
Copy link

github-actions bot commented Oct 17, 2025

Flaky tests detected in 085b50a.
Some tests passed with failed attempts. The failures may not be related to this commit but are still reported for visibility. See the documentation for more information.

🔍 Workflow run URL: https://github.com/WordPress/gutenberg/actions/runs/19715903838
📝 Reported issues:

Copy link
Member

@Mamaduka Mamaduka left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TIL about .mailmap. Thanks, @dmsnell!

@desrosj
Copy link
Member

desrosj commented Oct 17, 2025

It looks like this feature also supports mapping to a preferred email address. I'm wondering if we should map each contributor's username@git.wordpress.org email as the preferred one?

I also wonder if we could automate this at all. If the contributor has the email used when committing added as an alias on their account, the commit should be attributed to a user and we can use the w.org API to match with their .org account. That's not a blocker here, but was just thinking of ways to make this easier.

@dmsnell
Copy link
Member Author

dmsnell commented Oct 17, 2025

seems like a great idea @desrosj — I have reached out to some people I know to ask which of the four emails they prefer, but automation would help for the overwhelming majority, if people add those aliases.

one thing we might run into is that I predict there are significant accounts with no corresponding wordpress.org account.

my thinking is that maybe we could do some reasonable effort now to catch things we know about, merge this, then make a blog post on Make and leave a notice on the project README in hopes people see it when they come to the GitHub page.

@desrosj
Copy link
Member

desrosj commented Oct 17, 2025

I have reached out to some people I know to ask which of the four emails they prefer, but automation would help for the overwhelming majority, if people add those aliases.

To clarify, I'm suggesting that the canonical email used is not the choice of the contributor, but instead always the w.org one that we use in Co-authored-by trailers.

For instances where the user has not connected their w.org account, we could skip the correction of preferred email and just standardize their display name for now.

dmsnell added a commit that referenced this pull request Nov 26, 2025
There are numerous cases in this project where a single person has made
commits with multiple unique identities. Sometimes this is due to
configuration differences on new computers. Sometimes it’s because
someone changes their email. Sometimes people change their names.

Their digital legacy follows them in `git`. This patch introduces a
`.mailmap` file which provides the opportunity to remap names and email
addresses across supporting tools to combine or rename those identities.

Where available, emails should be the username@git.wordpress.org address.

See `git help mailmap`.

This change only impacts how `git` tools display author identities. It
includes no code or behavioral changes.

Co-authored-by: ajlende <ajlende@git.wordpress.org>
Co-authored-by: desrosj <desrosj@git.wordpress.org>
Co-authored-by: Mamaduka <mamaduka@git.wordpress.org>
Github-PR: 72412
Github-PR-URL: #72412
@dmsnell
Copy link
Member Author

dmsnell commented Nov 26, 2025

@desrosj I like the idea of using @git.wordpress.org. I love the idea of automating it, but I’m not sure how given that the names and emails may not be associated with the WordPress accounts.

Because I wanted to get something out there and establish a precedent, I have done my best to map and remap the top 30 names by commit count via git shortlog -sne. I think it would be nice to follow this up with an announcement on Make asking people to review their account and propose updates.

Perhaps we could automate where possible and go from there.

dmsnell added a commit that referenced this pull request Nov 26, 2025
There are numerous cases in this project where a single person has made
commits with multiple unique identities. Sometimes this is due to
configuration differences on new computers. Sometimes it’s because
someone changes their email. Sometimes people change their names.

Their digital legacy follows them in `git`. This patch introduces a
`.mailmap` file which provides the opportunity to remap names and email
addresses across supporting tools to combine or rename those identities.

Where available, emails should be the username@git.wordpress.org address.

See `git help mailmap`.

This change only impacts how `git` tools display author identities. It
includes no code or behavioral changes.

Co-authored-by: ajlende <ajlende@git.wordpress.org>
Co-authored-by: desrosj <desrosj@git.wordpress.org>
Co-authored-by: Mamaduka <mamaduka@git.wordpress.org>
Github-PR: 72412
Github-PR-URL: #72412
@dmsnell
Copy link
Member Author

dmsnell commented Nov 26, 2025

okay I’ve added more names and tried to catch duplicates where combining them would have a major impact on the commit-count for the individual. there were quite a few where two emails for the same person amounted to more than one hundred commits but each email only had half that associated with it. for these people they have been grossly under-represented in the commit counts because of the spreading of the attribution.

I have surely missed many people; perhaps gotten some wrong; hopefully people will review their own accounts and correct them

dmsnell added a commit that referenced this pull request Nov 26, 2025
There are numerous cases in this project where a single person has made
commits with multiple unique identities. Sometimes this is due to
configuration differences on new computers. Sometimes it’s because
someone changes their email. Sometimes people change their names.

Their digital legacy follows them in `git`. This patch introduces a
`.mailmap` file which provides the opportunity to remap names and email
addresses across supporting tools to combine or rename those identities.

Where available, emails should be the username@git.wordpress.org address.

See `git help mailmap`.

This change only impacts how `git` tools display author identities. It
includes no code or behavioral changes.

Co-authored-by: ajlende <ajlende@git.wordpress.org>
Co-authored-by: desrosj <desrosj@git.wordpress.org>
Co-authored-by: Mamaduka <mamaduka@git.wordpress.org>
Github-PR: 72412
Github-PR-URL: #72412
There are numerous cases in this project where a single person has made
commits with multiple unique identities. Sometimes this is due to
configuration differences on new computers. Sometimes it’s because
someone changes their email. Sometimes people change their names.

Their digital legacy follows them in `git`. This patch introduces a
`.mailmap` file which provides the opportunity to remap names and email
addresses across supporting tools to combine or rename those identities.

Where available, emails should be the username@git.wordpress.org address.

See `git help mailmap`.

This change only impacts how `git` tools display author identities. It
includes no code or behavioral changes.

Co-authored-by: ajlende <ajlende@git.wordpress.org>
Co-authored-by: desrosj <desrosj@git.wordpress.org>
Co-authored-by: Mamaduka <mamaduka@git.wordpress.org>
Github-PR: 72412
Github-PR-URL: #72412
@dmsnell dmsnell merged commit 085b50a into trunk Nov 26, 2025
33 checks passed
@dmsnell dmsnell deleted the meta/add-mailmap branch November 26, 2025 20:39
@github-actions github-actions bot added this to the Gutenberg 22.3 milestone Nov 26, 2025
peterwilsoncc pushed a commit to peterwilsoncc/gutenberg-build that referenced this pull request Nov 27, 2025
There are numerous cases in this project where a single person has made
commits with multiple unique identities. Sometimes this is due to
configuration differences on new computers. Sometimes it’s because
someone changes their email. Sometimes people change their names.

Their digital legacy follows them in `git`. This patch introduces a
`.mailmap` file which provides the opportunity to remap names and email
addresses across supporting tools to combine or rename those identities.

Where available, emails should be the username@git.wordpress.org address.

See `git help mailmap`.

This change only impacts how `git` tools display author identities. It
includes no code or behavioral changes.

Co-authored-by: ajlende <ajlende@git.wordpress.org>
Co-authored-by: desrosj <desrosj@git.wordpress.org>
Co-authored-by: Mamaduka <mamaduka@git.wordpress.org>
Github-PR: 72412
Github-PR-URL: WordPress/gutenberg#72412

Source: WordPress/gutenberg@085b50a
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

[Type] Build Tooling Issues or PRs related to build tooling

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants