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 <[email protected]>
 1Aaree <[email protected]>
 2Aaron D. Campbell <[email protected]>
-3Aaron Jorbin <[email protected]>
-9Aaron Jorbin <[email protected]>
-418Aaron Robertshaw <[email protected]>
+12Aaron Jorbin <[email protected]>
+418Aaron Robertshaw <[email protected]>
 1Aaron Ware <[email protected]>
 3Abdelmajid HAMDANI <[email protected]>
 1Abdullah Ramzan <[email protected]>
@@ -13,12 +12,9 @@
 2Abhishek Sharma <[email protected]>
 3Adam Boro <[email protected]>
 2Adam Bosco <[email protected]>
-235Adam Silverstein <[email protected]>
-8Adam Silverstein <[email protected]>
-13Adam Silverstein <[email protected]>
-9Adam Silverstein <[email protected]>
+265Adam Silverstein <[email protected]>
 1Adam Tak <[email protected]>
-228Adam Zielinski <[email protected]>
+228Adam Zieliński <[email protected]>
 1adambasa-dp <[email protected]>
 87Addison Stavlo <[email protected]>
 1Aditya Shah <[email protected]>
@@ -38,7 +34,7 @@
 1AJOTKA <[email protected]>
 2Akanshu Singh <[email protected]>
 1Akash Dhawade <[email protected]>
-881Aki Hamano <[email protected]>
+895Aki Hamano <[email protected]>
 16Akira Tachibana <[email protected]>
 6Akshat Kakkad <[email protected]>
 1Akshay S Dinesh <[email protected]>
@@ -64,14 +60,11 @@
 1Alex Florisca <[email protected]>
 1Alex Kirk <[email protected]>
 1Alex Kozack <[email protected]>
-47Alex Lende <[email protected]>
-40Alex Lende <[email protected]>
-34Alex Lende <[email protected]>
+121Alex Lende <[email protected]>
 2Alex Sanford <[email protected]>
 52Alex Stine <[email protected]>
 11Alex Woollam <[email protected]>
-113Alexander Botteram <[email protected]>
-10Alexander Botteram <[email protected]>
+123Alexander Botteram <[email protected]>
 3Alexandra Nyitraiova <[email protected]>
 1Alexandre Buffet <[email protected]>
 1Alexandre D'Eschambeault <[email protected]>
@@ -91,29 +84,19 @@
     33Amit Raj <[email protected]>
      1Amogh Harish <[email protected]>
      1Amr Gawish <[email protected]>
-     3André (On Vacation) <[email protected]>
-   440André <[email protected]>
-     3André <[email protected]>
-   106André <[email protected]>
+   758André Maneiro <[email protected]>
      2André Philip Kallehauge <[email protected]>
-   404Andrea Fercia <[email protected]>
+   404Andrea Fercia <[email protected]>
      2Andrea Roenning <[email protected]>
      1andreamiddleton <[email protected]>
      1Andrei Băicuș <[email protected]>
-     7andrei draganescu <[email protected]>
-     4Andrei Draganescu <[email protected]>
-    87andrei draganescu <[email protected]>
-   128Andrei Draganescu <[email protected]>
+   226Andrei Draganescu <[email protected]>
      1Andrei Glingeanu <[email protected]>
      3Andrei Lupu <[email protected]>
      2Andrei Surdu <[email protected]>
-     9Andrés <[email protected]>
      1Andres <[email protected]>
-   143Andrés <[email protected]>
      1Andrew DePaula <[email protected]>
-    37Andrew Duthie <[email protected]>
-   381Andrew Duthie <[email protected]>
-  1363Andrew Duthie <[email protected]>
+  1781Andrew Duthie <[email protected]>
      1Andrew Fair <[email protected]>
      1Andrew Fleming <[email protected]>
     32Andrew Hayward <[email protected]>
@@ -122,11 +105,9 @@
      1Andrew Matthews <[email protected]>
     12Andrew Munro <[email protected]>
      1Andrew Nevins <[email protected]>
-     3Andrew Ozz <[email protected]>
-     8Andrew Ozz <[email protected]>
+    11Andrew Ozz <[email protected]>
      2Andrew Roberts <[email protected]>
-   319Andrew Serong <[email protected]>
-     1Andrew Serong <[email protected]>
+   320Andrew Serong <[email protected]>
      1Andrey <[email protected]>
      2Andy Fragen <[email protected]>
     27Andy Peatling <[email protected]>
@@ -165,10 +146,7 @@
      1ArnaudBan <[email protected]>
      1Arslan Ahmed <[email protected]>
      1Arslan Kalwar <[email protected]>
-    33Artemio Morales <[email protected]>
-     1Artemio Morales <[email protected]>
-     2Artemio Morales <[email protected]>
-     3Artemio Morales <[email protected]>
+    39Artemio Morales <[email protected]>
     17arthur791004 <[email protected]>
      1arthur791004 <[email protected]>
      1Artur Grabowski <[email protected]>
@@ -197,7 +175,7 @@
      1Basti Becker <[email protected]>
     45BE-Webdesign <[email protected]>
      2Bec Scott <[email protected]>
-   342Ben Dwyer <[email protected]>
+   344Ben Dwyer <[email protected]>
      1Ben Greeley <[email protected]>
      1Ben Harris <[email protected]>
      2Ben Keith <[email protected]>
@@ -214,8 +192,7 @@
      3Benoît Chantre <[email protected]>
      1benridane <[email protected]>
      1Bernhard Kau <[email protected]>
-    90Bernie Reiter <[email protected]>
-   160Bernie Reiter <[email protected]>
+   250Bernie Reiter <[email protected]>
      1Bhanu <[email protected]>
      1Bhavik Kalpesh <[email protected]>
      1Bill Columbia <[email protected]>
@@ -267,8 +244,7 @@
     33Carlos Bravo <[email protected]>
      1Carlos Galarza <[email protected]>
    229Carlos Garcia <[email protected]>
-    33Carolina Nymark <[email protected]>
-   162Carolina Nymark <[email protected]>
+   195Carolina Nymark <[email protected]>
      1Carsten Bach <[email protected]>
     51Ceyhun Ozugur <[email protected]>
     39Chad Chadbourne <[email protected]>
@@ -348,8 +324,7 @@
      1Daniel Horton-Wellings <[email protected]>
      1Daniel James <[email protected]>
      2Daniel L. Iser <[email protected]>
-    67Daniel Richards <[email protected]>
-   618Daniel Richards <[email protected]>
+   685Daniel Richards <[email protected]>
      1Daniel Schutzsmith <[email protected]>
      3Daniel Walmsley <[email protected]>
     28Danilo Ercoli <[email protected]>
@@ -362,22 +337,20 @@
      2Dave Moran <[email protected]>
      1Dave Page <[email protected]>
      1Dave Parker <[email protected]>
-   460Dave Smith <[email protected]>
      9Dave Whitley <[email protected]>
      1David Aguilera <[email protected]>
      3David Aguilera <[email protected]>
      3David Arenas <[email protected]>
    101David Arenas <[email protected]>
      2David Biňovec <[email protected]>
-    67David Calhoun <[email protected]>
-    12David Calhoun <[email protected]>
-    76David Calhoun <[email protected]>
+   155David Calhoun <[email protected]>
      1David Gwyer <[email protected]>
      2David Herrera <[email protected]>
      1David Page <[email protected]>
      1David Paul Ellenwood <[email protected]>
      2David Rozando <[email protected]>
      5David Ryan <[email protected]>
+   460David Smith <[email protected]>
      1David Sword <[email protected]>
    104Dávid Szabó <[email protected]>
      1Davis Shaver <[email protected]>
@@ -388,7 +361,7 @@
      1Deepak Mahendrakar <[email protected]>
      6Delowar Hossain <[email protected]>
      2Denis Žoljom <[email protected]>
-   110Dennis Snell <[email protected]>
+   112Dennis Snell <[email protected]>
    229dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
     45Derek Blank <[email protected]>
     22Derek Sifford <[email protected]>
@@ -435,16 +408,7 @@
      1ElectricFeet <[email protected]>
      4Eliezer Peña <[email protected]>
      5Elio Rivero <[email protected]>
-   421Ella <[email protected]>
-   112Ella <[email protected]>
-     2Ella Iseulde Van Dorpe <[email protected]>
-     6Ella van Durpe <[email protected]>
-   119Ella Van Dorpe <[email protected]>
-   158Ella van Durpe <[email protected]>
-     4Ella van Durpe <[email protected]>
-    37Ella van Durpe <[email protected]>
-    24Ella Van Durpe <[email protected]>
-   466Ella van Durpe <[email protected]>
+  1635Ella van Durpe <[email protected]>
      1Emerson "Duke" Almeida <[email protected]>
      1Emilio Martinez <[email protected]>
      1Emir Ugljanin <[email protected]>
@@ -520,10 +484,9 @@
     19George Hotelling <[email protected]>
     15George Hotelling <[email protected]>
      1George Karakostas <[email protected]>
-  1492George Mamadashvili <[email protected]>
+  1492George Mamadashvili <[email protected]>
      2George Stephanis <[email protected]>
-   265Gerardo Pacheco <[email protected]>
-     2Gerardo Pacheco <[email protected]>
+   267Gerardo Pacheco <[email protected]>
      7Gio Lodi <[email protected]>
      1Gio Lodi <[email protected]>
      1GitDown Jambersaw <[email protected]>
@@ -534,12 +497,8 @@
      3Greg Rickaby <[email protected]>
      1Greg Ross <[email protected]>
      1Greg Sullivan <[email protected]>
-   384Greg Ziółkowski <[email protected]>
-    14Grzegorz (Greg) Ziółkowski <[email protected]>
-   427Grzegorz (Greg) Ziółkowski <[email protected]>
+  1129Grzegorz (Greg) Ziółkowski <[email protected]>
     14Grzegorz <[email protected]>
-   291Grzegorz Ziolkowski <[email protected]>
-    13Grzegorz Ziółkowski <[email protected]>
      4Guido Scialfa <[email protected]>
      1Gulamdastgir-Momin <[email protected]>
      1Gustavo Bordoni <[email protected]>
@@ -556,8 +515,8 @@
      1Hasnain Ashfaq <[email protected]>
      5haunzala <[email protected]>
     55Haz <[email protected]>
-    49Héctor <[email protected]>
      1Hector Jarquin <[email protected]>
+    51Héctor Prieto <[email protected]>
      1Heiko Lübbe <[email protected]>
      1Helen Hou-Sandi <[email protected]>
      6Hendrik Luehrsen <[email protected]>
@@ -605,8 +564,7 @@
      1Ipstenu (Mika Epstein) <[email protected]>
      9Irene <[email protected]>
      6IreneStr <[email protected]>
-   283iseulde <[email protected]>
-     3iseulde <[email protected]>
+   339Isabel Brison <[email protected]>
      1Ismael Martín Alabarce <[email protected]>
      1Israel Shmueli <[email protected]>
      3Iulia Cazan <[email protected]>
@@ -627,9 +585,9 @@
      1Jake Spurlock <[email protected]>
     32James <[email protected]>
    264James Johnson <[email protected]>
-   297James Koster <[email protected]>
+   297James Koster <[email protected]>
      5James Newell <[email protected]>
-   157James Nylen <[email protected]>
+   157James Nylen <[email protected]>
      1James Stine <[email protected]>
      1James Tryon <[email protected]>
      1Jamie Halvorson <[email protected]>
@@ -640,10 +598,9 @@
      1jankimoradiya <[email protected]>
      7Janvo Aldred <[email protected]>
      5Janw Oostendorp <[email protected]>
-   311Jarda Snajdr <[email protected]>
+   311Jarda Snajdr <[email protected]>
      1Jarkko Saltiola <[email protected]>
      1Jarred Kennedy <[email protected]>
-     3jasmussen <[email protected]>
      1Jason Agnew <[email protected]>
      2Jason Agnew <[email protected]>
      5Jason Caldwell <[email protected]>
@@ -712,11 +669,7 @@
      1Joe McGill <[email protected]>
     34Joel Dean <[email protected]>
      1Joel Thiessen <[email protected]>
-   509Joen A <[email protected]>
-    34Joen A. <[email protected]>
-     7Joen Asmussen <[email protected]>
-   209Joen Asmussen <[email protected]>
-   749Joen Asmussen <[email protected]>
+  1511Joen Asmussen <[email protected]>
     31John <[email protected]>
     39John Blackbourn <[email protected]>
      1John David Griffin <[email protected]>
@@ -728,18 +681,13 @@
 7John Watkins <[email protected]>
 5johnwatkins0 <[email protected]>
 1jomurgel <[email protected]>
-26Jon Desrosiers <[email protected]>
-2Jon Q <[email protected]>
-41Jon Quach <[email protected]>
-67Jon Surrell <[email protected]>
-111Jon Surrell <[email protected]>
+178Jon Surrell <[email protected]>
 1Jonah Tan <[email protected]>
 1Jonathan <[email protected]>
 2Jonathan Belcher <[email protected]>
 5Jonathan Bossenger <[email protected]>
 1Jonathan Champ <[email protected]>
-20Jonathan Desrosiers <[email protected]>
-12Jonathan Desrosiers <[email protected]>
+58Jonathan Desrosiers <[email protected]>
 2Jonathan Goldford <[email protected]>
 1Jonathan Wold <[email protected]>
 7Joni Erkkilä <[email protected]>
@@ -748,12 +696,10 @@
 1Jordan Harband <[email protected]>
 4jordesign <[email protected]>
 2jordesign <[email protected]>
-337Jorge <[email protected]>
 13Jorge Bernal <[email protected]>
 17Jorge Bernal <[email protected]>
 1Jorge Contreras <[email protected]>
-331Jorge Costa <[email protected]>
-584Jorge Costa <[email protected]>
+1252Jorge Costa <[email protected]>
 1JorgeVilchez95 <[email protected]>
 1jornp <[email protected]>
 10Jos <[email protected]>
@@ -789,7 +735,7 @@
 1Juzar Bharmal <[email protected]>
 1Jyotirmoy Roy <[email protected]>
 4K Adam White <[email protected]>
-273Kai Hao <[email protected]>
+273Kai Hao <[email protected]>
 1Kamata Ryo <[email protected]>
 1Kapil Paul <[email protected]>
 6Karol Gorski <[email protected]>
@@ -858,7 +804,7 @@
 2Lee Pak <[email protected]>
 3Lee Willis <[email protected]>
 1Leemy Pakvn <[email protected]>
-425Lena Morita <[email protected]>
+426Lena Morita <[email protected]>
 1Léo Muniz <[email protected]>
 2Leo Postovoit <[email protected]>
 1leutrimhusaj <[email protected]>
@@ -916,20 +862,18 @@
 1Marcin Pietrzak <[email protected]>
 2Márcio Duarte <[email protected]>
 1Marco <[email protected]>
-446Marco Ciampini <[email protected]>
+446Marco Ciampini <[email protected]>
 3Marco Enrico <[email protected]>
 1Marco Fernandes <[email protected]>
 1Marco Pereirinha <[email protected]>
 3Marco Zehe <[email protected]>
-404Marcus Kazmierczak <[email protected]>
+404Marcus Kazmierczak <[email protected]>
 3Marek Dědič <[email protected]>
 13Marek Hrabe <[email protected]>
 10margolisj <[email protected]>
 1Marie Comet <[email protected]>
 1Marie Comet <[email protected]>
-678Marin Atanasov <[email protected]>
-1Marin Atanasov <[email protected]>
-1Marin Atanasov <[email protected]>
+680Marin Atanasov <[email protected]>
 120Mario Santos <[email protected]>
 1Marissa <[email protected]>
 2Marius L. Jensen <[email protected]>
@@ -955,8 +899,7 @@
 3Mathiu <[email protected]>
 110Matias Benedetto <[email protected]>
 1Matías Surdi <[email protected]>
-272Matias Ventura <[email protected]>
-86Matías Ventura <[email protected]>
+358Matías Ventura <[email protected]>
 2Matt <[email protected]>
 19Matt Chowning <[email protected]>
 28Matt Chowning <[email protected]>
@@ -989,7 +932,6 @@
 19Mayank Tripathi <[email protected]>
 2Mayuko Moriyama <[email protected]>
 1Mayur Prajapati <[email protected]>
-2mcsf <[email protected]>
 1Md Aminul Islam <[email protected]>
 1meetjey <[email protected]>
 5megane9988 <[email protected]>
@@ -1014,8 +956,7 @@
 3Michal Iwanow <[email protected]>
 2MichalKarbownik <[email protected]>
 1Micheal Harker <[email protected]>
-41Miguel Fonseca <[email protected]>
-227Miguel Fonseca <[email protected]>
+270Miguel Fonseca <[email protected]>
 2Miguel Lezama <[email protected]>
 7Miguel Torres <[email protected]>
 11Miguel Torres <[email protected]>
@@ -1043,7 +984,6 @@
 2Miles Elliott <[email protected]>
 8mimi <[email protected]>
 4Minal Diwan <[email protected]>
-1mirka <[email protected]>
 1Mirosław Filipiak <[email protected]>
 120Mitchell Austin <[email protected]>
 6mitogh <[email protected]>
@@ -1091,10 +1031,7 @@
 1Nguyễn Minh Khôi <[email protected]>
 1Nicholas Tillman <[email protected]>
 1Nick Cernis <[email protected]>
-59Nick Diego <[email protected]>
-1Nick Diego <[email protected]>
-81Nick Diego <[email protected]>
-1Nick Diego <[email protected]>
+142Nick Diego <[email protected]>
 1Nick Galvez <[email protected]>
 1Nicky Lim <[email protected]>
 134Nicola Heald <[email protected]>
@@ -1102,7 +1039,7 @@
 1Nicolas Juen <[email protected]>
 1Nidhi Dhandhukiya <[email protected]>
 3Niels Lange <[email protected]>
-749Nik Tsekouras <[email protected]>
+767Nik Tsekouras <[email protected]>
 1Nikhil Chavan <[email protected]>
 1Nikita <[email protected]>
 2Niklas P <[email protected]>
@@ -1114,8 +1051,6 @@
 1Nitish Kaila <[email protected]>
 122Noah Allen <[email protected]>
 3Noah Shrader <[email protected]>
-18ntsekouras <[email protected]>
-54O André <[email protected]>
 17Oguz Kocer <[email protected]>
 1okawayasuno <[email protected]>
 7okmttdhr, tada <[email protected]>
@@ -1133,9 +1068,7 @@
 1paolopiaggio <[email protected]>
 1Paresh Radadiya <[email protected]>
 1Parikshit Adhikari <[email protected]>
-14Pascal Birchler <[email protected]>
-35Pascal Birchler <[email protected]>
-60Pascal Birchler <[email protected]>
+109Pascal Birchler <[email protected]>
 1Patricia Hillebrandt <[email protected]>
 1Patrick Boehner <[email protected]>
 1Patrick Lindsay <[email protected]>
@@ -1163,8 +1096,7 @@
 1Peter Petrov <[email protected]>
 1Peter Tasker <[email protected]>
 3Peter Vogel <[email protected]>
-40Peter Wilson <[email protected]>
-4Peter Wilson <[email protected]>
+44Peter Wilson <[email protected]>
 1Petros Paraskevopoulos <[email protected]>
 116Petter Walbø Johnsgård <[email protected]>
 1PG Lewis <[email protected]>
@@ -1201,9 +1133,8 @@
 1Pratik K. Yadav <[email protected]>
 1Pratik Kumar <[email protected]>
 2Presskopp <[email protected]>
-2priethor <[email protected]>
 1properlypurple <[email protected]>
-44Q <[email protected]>
+87Q <[email protected]>
 3Quintis1212 <[email protected]>
 2Raaj Trambadia <[email protected]>
 1Rachel Baker <[email protected]>
@@ -1226,7 +1157,7 @@
 5Rami Yushuvaev <[email protected]>
 1ramizmanked <[email protected]>
 25Ramon <[email protected]>
-484Ramon <[email protected]>
+484Ramon <[email protected]>
 1Ramon Ahnert <[email protected]>
 1ramonjd <[email protected]>
 1Randhir <[email protected]>
@@ -1242,10 +1173,9 @@
 1Ren <[email protected]>
 8Renatho De Carli Rosa <[email protected]>
 1Renato Augusto Gama dos Santos <[email protected]>
-2667Riad Benguella <[email protected]>
+2667Riad Benguella <[email protected]>
 1Rich Collier <[email protected]>
-2Rich Tabor <[email protected]>
-195Rich Tabor <[email protected]>
+197Rich Tabor <[email protected]>
 2Richard Ortiz <[email protected]>
 2Richie Carey <[email protected]>
 1Riddhi <[email protected]>
@@ -1261,8 +1191,7 @@
 1rithik56 <[email protected]>
 2Ritoban Dutta <[email protected]>
 1Rob Scott <[email protected]>
-1Robert Anderson <[email protected]>
-534Robert Anderson <[email protected]>
+535Robert Anderson <[email protected]>
 2Robert DeVore <[email protected]>
 1Robert Lee <[email protected]>
 1Robert O'Rourke <[email protected]>
@@ -1293,9 +1222,7 @@
      1Rudy Susanto <[email protected]>
      9Ryan Kienstra <[email protected]>
      3Ryan McCue <[email protected]>
-    66Ryan Welcher <[email protected]>
-     8Ryan Welcher <[email protected]>
-    15Ryan Welcher <[email protected]>
+    89Ryan Welcher <[email protected]>
      1Ryo Utsunomiya <[email protected]>
      1Sabbir Ahmed <[email protected]>
      1Sabrina Zeidan <[email protected]>
@@ -1321,13 +1248,9 @@
      1Santiago Cerro López <[email protected]>
      1Sanzeeb Aryal <[email protected]>
      1Sara Cope <[email protected]>
-    20Sara Marcondes <[email protected]>
+   165Sara Marcondes <[email protected]>
     16sarah ✈ semark <[email protected]>
-    47Sarah Norris <[email protected]>
-    24Sarah Norris <[email protected]>
-    83sarayourfriend <[email protected]>
-    10sarayourfriend <[email protected]>
-    52sarayourfriend <[email protected]>
+    71Sarah Norris <[email protected]>
      9Sarthak Nagoshe <[email protected]>
      1Sathiya Venkatesan <[email protected]>
      1Saulius Vikerta <[email protected]>
@@ -1336,7 +1259,6 @@
      1sc81 <[email protected]>
      1sc81 <[email protected]>
      1Scott Weaver <[email protected]>
-     2scruffian <[email protected]>
      1Sean Fisher <[email protected]>
      1SeanMcMillan <[email protected]>
      1Sébastien SERRE <[email protected]>
@@ -1377,8 +1299,7 @@
      2Simon <[email protected]>
      4Simon Hammes <[email protected]>
      2Simon Olofsson <[email protected]>
-    69Siobhan Bamber <[email protected]>
-    14Siobhan Bamber <[email protected]>
+    83Siobhan Bamber <[email protected]>
      2SirLouen <[email protected]>
      1Sjoerd Boerrigter <[email protected]>
      1skierpage <[email protected]>
@@ -1386,10 +1307,7 @@
      4Sneha Patil <[email protected]>
      2Sofia Sousa <[email protected]>
      1Sohail khan <[email protected]>
-     6Sören Wrede <[email protected]>
-    11Sören Wrede <[email protected]>
-   186Sören Wrede <[email protected]>
-     7Sören Wünsch <[email protected]>
+   210Sören Wünsch <[email protected]>
      3Sourav Pahwa <[email protected]>
      1Spencer Williams <[email protected]>
      1ssergei <[email protected]>
@@ -1424,8 +1342,7 @@
      5Takashi Kitajima <[email protected]>
      2Takayuki Miyauchi <[email protected]>
      2Takshil Kunadia <[email protected]>
-    43Tammie Lister <[email protected]>
-    66Tammie Lister <[email protected]>
+   109Tammie Lister <[email protected]>
      7Tanner Stokes <[email protected]>
      1Tanner Stokes <[email protected]>
      1tara king <[email protected]>
@@ -1434,14 +1351,10 @@
      1tdesero <[email protected]>
      1TeBenachi <[email protected]>
      3Technote <[email protected]>
-    22tellthemachines <[email protected]>
-   317tellthemachines <[email protected]>
      5tellyworth <[email protected]>
      6Teresa Gobble <[email protected]>
      1Teresa Gobble <[email protected]>
      1Terri Ann <[email protected]>
-     2Tetsuaki Hamano / 浜野 哲明 <[email protected]>
-    12Tetsuaki Hamano <[email protected]>
      5tfrommen <[email protected]>
     11tg-ephox <[email protected]>
      1tharsheblows <[email protected]>
@@ -1537,9 +1450,7 @@
      1Walter Ebert <[email protected]>
      2WebPraktikos <[email protected]>
      1Wendy Chen <[email protected]>
-     8Weston Ruter <[email protected]>
-    91Weston Ruter <[email protected]>
-    25Weston Ruter <[email protected]>
+   124Weston Ruter <[email protected]>
      6Will Skora <[email protected]>
      1Willem Prins <[email protected]>
     24William Earnhardt <[email protected]>

@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 <[email protected]>
Co-authored-by: Mamaduka <[email protected]>
Co-authored-by: ajlende <[email protected]>
Co-authored-by: desrosj <[email protected]>

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 [email protected] 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 [email protected] 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 <[email protected]>
Co-authored-by: desrosj <[email protected]>
Co-authored-by: Mamaduka <[email protected]>
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 [email protected] 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 <[email protected]>
Co-authored-by: desrosj <[email protected]>
Co-authored-by: Mamaduka <[email protected]>
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 [email protected] 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 <[email protected]>
Co-authored-by: desrosj <[email protected]>
Co-authored-by: Mamaduka <[email protected]>
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 [email protected] 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 <[email protected]>
Co-authored-by: desrosj <[email protected]>
Co-authored-by: Mamaduka <[email protected]>
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 [email protected] 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 <[email protected]>
Co-authored-by: desrosj <[email protected]>
Co-authored-by: Mamaduka <[email protected]>
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