<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[58899] trunk/.mailmap: Meta: Add .mailmap to ascribe git commits to proper author.</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/58899">58899</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/58899","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dmsnell</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2024-08-14 22:55:54 +0000 (Wed, 14 Aug 2024)</dd>
</dl>

<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Meta: Add .mailmap to ascribe git commits to proper author.

>From time to time a new commit will appear from an existing commit which has a different name or email address (or both) than an existing name or email address. This occurs because of changing names and changing emails and because of mistakes. Additionally, the `svg`-to-`git` process double-encodes names from `profiles.wordpress.org` causing corruption in names with non-US-ASCII characters.

This patch introduces a `.mailmap` file to alias committers so that:

 - All contributions for a given person are shown for that person.
 - Committers will be able to control or fix the display of their own name.

The `.mailmap` file is a standard `git` configuration.

Developed in https://github.com/wordpress/wordpress-develop/pull/7180
Discussed in https://core.trac.wordpress.org/ticket/61864

Fixes <a href="https://core.trac.wordpress.org/ticket/61864">#61864</a>.</pre>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkmailmap">trunk/.mailmap</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkmailmap"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/.mailmap</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/.mailmap                            (rev 0)
+++ trunk/.mailmap      2024-08-14 22:55:54 UTC (rev 58899)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,124 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+# Aliases names and emails inside of commits.
+# See https://git-scm.com/docs/gitmailmap
+#
+# Some entries appear as duplicates, but are both required to correct
+# identities with just the wrong name as well as those with the wrong
+# name and also the wrong email address.
+
+Aaron D. Campbell <aaroncampbell@git.wordpress.org> <aaroncampbell@602fd350-edb4-49c9-b593-d223f7449a82>
+Aaron Jorbin <jorbin@git.wordpress.org> <jorbin@602fd350-edb4-49c9-b593-d223f7449a82>
+Adam Silverstein <adamsilverstein@git.wordpress.org> <adamsilverstein@602fd350-edb4-49c9-b593-d223f7449a82>
+Alex King <alexkingorg@git.wordpress.org> <alexkingorg@602fd350-edb4-49c9-b593-d223f7449a82>
+Alex Shiels <tellyworth@git.wordpress.org> <tellyworth@602fd350-edb4-49c9-b593-d223f7449a82>
+André <oandregal@git.wordpress.org>
+André <oandregal@git.wordpress.org> <oandregal@602fd350-edb4-49c9-b593-d223f7449a82>
+Andrea Fercia <afercia@git.wordpress.org> <afercia@602fd350-edb4-49c9-b593-d223f7449a82>
+Andrew Duthie <aduth@git.wordpress.org> <aduth@602fd350-edb4-49c9-b593-d223f7449a82>
+Andrew Nacin <nacin@git.wordpress.org> <nacin@602fd350-edb4-49c9-b593-d223f7449a82>
+Andrew Ozz <azaozz@git.wordpress.org> <azaozz@602fd350-edb4-49c9-b593-d223f7449a82>
+Anthony Burchell <antpb@git.wordpress.org> <antpb@602fd350-edb4-49c9-b593-d223f7449a82>
+Anton Timmermans <atimmer@git.wordpress.org> <atimmer@602fd350-edb4-49c9-b593-d223f7449a82>
+Bernie Reiter <bernhard-reiter@git.wordpress.org>
+Bernie Reiter <bernhard-reiter@git.wordpress.org> <bernhard-reiter@602fd350-edb4-49c9-b593-d223f7449a82>
+Boone Gorges <boonebgorges@git.wordpress.org> <boonebgorges@602fd350-edb4-49c9-b593-d223f7449a82>
+Carlos Bravo <cbravobernal@git.wordpress.org> <cbravobernal@602fd350-edb4-49c9-b593-d223f7449a82>
+Colin Stewart <costdev@git.wordpress.org> <costdev@602fd350-edb4-49c9-b593-d223f7449a82>
+Daniel Bachhuber <danielbachhuber@git.wordpress.org> <danielbachhuber@602fd350-edb4-49c9-b593-d223f7449a82>
+Daniel Richards <talldanwp@git.wordpress.org> <talldanwp@602fd350-edb4-49c9-b593-d223f7449a82>
+Daryl Koopersmith <koop@git.wordpress.org> <koop@602fd350-edb4-49c9-b593-d223f7449a82>
+David A. Kennedy <davidakennedy@git.wordpress.org> <davidakennedy@602fd350-edb4-49c9-b593-d223f7449a82>
+David Baumwald <davidbaumwald@git.wordpress.org> <davidbaumwald@602fd350-edb4-49c9-b593-d223f7449a82>
+Dennis Snell <dmsnell@git.wordpress.org> <dmsnell@602fd350-edb4-49c9-b593-d223f7449a82>
+Dion Hulse <dd32@git.wordpress.org> <dd32@602fd350-edb4-49c9-b593-d223f7449a82>
+Dominik Schilling <ocean90@git.wordpress.org>
+Dominik Schilling <ocean90@git.wordpress.org> <ocean90@602fd350-edb4-49c9-b593-d223f7449a82>
+Donncha O Caoimh <donncha@git.wordpress.org> <donncha@602fd350-edb4-49c9-b593-d223f7449a82>
+Dougal Campbell <dougal@git.wordpress.org> <dougal@602fd350-edb4-49c9-b593-d223f7449a82>
+Drew Jaynes <drewapicture@git.wordpress.org>
+Drew Jaynes <drewapicture@git.wordpress.org> <DrewAPicture@602fd350-edb4-49c9-b593-d223f7449a82>
+Drew Jaynes <drewapicture@git.wordpress.org> <drewapicture@602fd350-edb4-49c9-b593-d223f7449a82>
+Ella <ellatrix@git.wordpress.org>
+Ella <ellatrix@git.wordpress.org> <ellatrix@602fd350-edb4-49c9-b593-d223f7449a82>
+Ella <ellatrix@git.wordpress.org> <iseulde@602fd350-edb4-49c9-b593-d223f7449a82>
+Ella <ellatrix@git.wordpress.org> <iseulde@git.wordpress.org>
+Eric Andrew Lewis <ericlewis@git.wordpress.org> <ericlewis@602fd350-edb4-49c9-b593-d223f7449a82>
+Felix Arntz <flixos90@git.wordpress.org> <flixos90@602fd350-edb4-49c9-b593-d223f7449a82>
+Gary Pendergast <pento@git.wordpress.org> <pento@602fd350-edb4-49c9-b593-d223f7449a82>
+Greg Ziółkowski <gziolo@git.wordpress.org>
+Greg Ziółkowski <gziolo@git.wordpress.org> <gziolo@602fd350-edb4-49c9-b593-d223f7449a82>
+Helen Hou-Sandi <helen@git.wordpress.org> <helen@602fd350-edb4-49c9-b593-d223f7449a82>
+Ian Belanger <ianbelanger@git.wordpress.org> <ianbelanger@602fd350-edb4-49c9-b593-d223f7449a82>
+Ian Dunn <iandunn@git.wordpress.org> <iandunn@602fd350-edb4-49c9-b593-d223f7449a82>
+Ian Stewart <iandstewart@git.wordpress.org> <iandstewart@602fd350-edb4-49c9-b593-d223f7449a82>
+Isabel Brison <isabel_brison@git.wordpress.org> <isabel_brison@602fd350-edb4-49c9-b593-d223f7449a82>
+Jake Spurlock <whyisjake@git.wordpress.org> <whyisjake@602fd350-edb4-49c9-b593-d223f7449a82>
+James Nylen <jnylen0@git.wordpress.org> <jnylen0@602fd350-edb4-49c9-b593-d223f7449a82>
+Jb Audras <audrasjb@git.wordpress.org> <audrasjb@602fd350-edb4-49c9-b593-d223f7449a82>
+Jeff Ong <jffng@git.wordpress.org> <jffng@602fd350-edb4-49c9-b593-d223f7449a82>
+Jeremy Felt <jeremyfelt@git.wordpress.org> <jeremyfelt@602fd350-edb4-49c9-b593-d223f7449a82>
+Joe Dolson <joedolson@git.wordpress.org> <joedolson@602fd350-edb4-49c9-b593-d223f7449a82>
+Joe Hoyle <joehoyle@git.wordpress.org> <joehoyle@602fd350-edb4-49c9-b593-d223f7449a82>
+Joe McGill <joemcgill@git.wordpress.org> <joemcgill@602fd350-edb4-49c9-b593-d223f7449a82>
+John Blackbourn <johnbillion@git.wordpress.org> <johnbillion@602fd350-edb4-49c9-b593-d223f7449a82>
+John James Jacoby <johnjamesjacoby@git.wordpress.org> <johnjamesjacoby@602fd350-edb4-49c9-b593-d223f7449a82>
+Jon Cave <duck_@git.wordpress.org> <duck_@602fd350-edb4-49c9-b593-d223f7449a82>
+Jonathan Desrosiers <desrosj@git.wordpress.org> <desrosj@602fd350-edb4-49c9-b593-d223f7449a82>
+Jonny Harris <spacedmonkey@git.wordpress.org> <spacedmonkey@602fd350-edb4-49c9-b593-d223f7449a82>
+Jorge Costa <jorgefilipecosta@git.wordpress.org> <jorgefilipecosta@602fd350-edb4-49c9-b593-d223f7449a82>
+Joseph Scott <josephscott@git.wordpress.org> <josephscott@602fd350-edb4-49c9-b593-d223f7449a82>
+Juliette Reinders Folmer <jrf@git.wordpress.org>
+Juliette Reinders Folmer <jrf@git.wordpress.org> <jrf@602fd350-edb4-49c9-b593-d223f7449a82>
+K. Adam White <kadamwhite@git.wordpress.org> <kadamwhite@602fd350-edb4-49c9-b593-d223f7449a82>
+Kelly Choyce-Dwan <ryelle@git.wordpress.org>
+Kelly Choyce-Dwan <ryelle@git.wordpress.org> <ryelle@602fd350-edb4-49c9-b593-d223f7449a82>
+Konstantin Kovshenin <kovshenin@git.wordpress.org> <kovshenin@602fd350-edb4-49c9-b593-d223f7449a82>
+Konstantin Obenland <obenland@git.wordpress.org>
+Konstantin Obenland <obenland@git.wordpress.org> <obenland@602fd350-edb4-49c9-b593-d223f7449a82>
+Lance Willett <lancewillett@git.wordpress.org> <lancewillett@602fd350-edb4-49c9-b593-d223f7449a82>
+Marius L. J <clorith@git.wordpress.org> <clorith@602fd350-edb4-49c9-b593-d223f7449a82>
+Mark Jaquith <markjaquith@git.wordpress.org> <markjaquith@602fd350-edb4-49c9-b593-d223f7449a82>
+Matias Ventura <matveb@git.wordpress.org> <matveb@602fd350-edb4-49c9-b593-d223f7449a82>
+Matt Mullenweg <matt@git.wordpress.org> <matt@602fd350-edb4-49c9-b593-d223f7449a82>
+Matt Thomas <iammattthomas@git.wordpress.org> <iammattthomas@602fd350-edb4-49c9-b593-d223f7449a82>
+Mel Choyce <melchoyce@git.wordpress.org> <melchoyce@602fd350-edb4-49c9-b593-d223f7449a82>
+Michael Adams <mdawaffe@git.wordpress.org>
+Michael Adams <mdawaffe@git.wordpress.org> <mdawaffe@602fd350-edb4-49c9-b593-d223f7449a82>
+Michael Arestad <michael-arestad@git.wordpress.org> <michael-arestad@602fd350-edb4-49c9-b593-d223f7449a82>
+Michal Czaplinski <czapla@git.wordpress.org> <czapla@602fd350-edb4-49c9-b593-d223f7449a82>
+Miguel Fonseca <mcsf@git.wordpress.org> <mcsf@602fd350-edb4-49c9-b593-d223f7449a82>
+Mike Little <mikelittle@git.wordpress.org> <mikelittle@602fd350-edb4-49c9-b593-d223f7449a82>
+Mike Schroder <mikeschroder@git.wordpress.org> <mikeschroder@602fd350-edb4-49c9-b593-d223f7449a82>
+Nikolay Bachiyski <nbachiyski@git.wordpress.org> <nbachiyski@602fd350-edb4-49c9-b593-d223f7449a82>
+Omar Reiss <omarreiss@git.wordpress.org> <omarreiss@602fd350-edb4-49c9-b593-d223f7449a82>
+Pascal Birchler <swissspidy@git.wordpress.org> <swissspidy@602fd350-edb4-49c9-b593-d223f7449a82>
+Pete Mall <petemall@git.wordpress.org> <petemall@602fd350-edb4-49c9-b593-d223f7449a82>
+Peter Westwood <westi@git.wordpress.org> <westi@602fd350-edb4-49c9-b593-d223f7449a82>
+Peter Wilson <peterwilsoncc@git.wordpress.org> <peterwilsoncc@602fd350-edb4-49c9-b593-d223f7449a82>
+Rachel Baker <rachelbaker@git.wordpress.org> <rachelbaker@602fd350-edb4-49c9-b593-d223f7449a82>
+Riad Benguella <youknowriad@git.wordpress.org> <youknowriad@602fd350-edb4-49c9-b593-d223f7449a82>
+Robert Anderson <noisysocks@git.wordpress.org> <noisysocks@602fd350-edb4-49c9-b593-d223f7449a82>
+Ron Rennick <wpmuguru@git.wordpress.org> <wpmuguru@602fd350-edb4-49c9-b593-d223f7449a82>
+Ryan Boren <ryan@git.wordpress.org> <ryan@602fd350-edb4-49c9-b593-d223f7449a82>
+Ryan McCue <rmccue@git.wordpress.org> <rmccue@602fd350-edb4-49c9-b593-d223f7449a82>
+Scott Taylor <wonderboymusic@git.wordpress.org> <wonderboymusic@602fd350-edb4-49c9-b593-d223f7449a82>
+Sergey Biryukov <sergeybiryukov@git.wordpress.org> <SergeyBiryukov@602fd350-edb4-49c9-b593-d223f7449a82>
+Sergey Biryukov <sergeybiryukov@git.wordpress.org> <sergeybiryukov@602fd350-edb4-49c9-b593-d223f7449a82>
+Tammie Lister <karmatosed@git.wordpress.org>
+Tammie Lister <karmatosed@git.wordpress.org> <karmatosed@602fd350-edb4-49c9-b593-d223f7449a82>
+Timothy Jacobs <timothyblynjacobs@git.wordpress.org> <TimothyBlynJacobs@602fd350-edb4-49c9-b593-d223f7449a82>
+Timothy Jacobs <timothyblynjacobs@git.wordpress.org> <timothyblynjacobs@602fd350-edb4-49c9-b593-d223f7449a82>
+Tonya Mork <hellofromTonya@git.wordpress.org> <hellofromTonya@602fd350-edb4-49c9-b593-d223f7449a82>
+Tonya Mork <hellofromTonya@git.wordpress.org> <hellofromtonya@git.wordpress.org>
+Weston Ruter <westonruter@git.wordpress.org> <westonruter@602fd350-edb4-49c9-b593-d223f7449a82>
+allancole <allancole@git.wordpress.org> <allancole@602fd350-edb4-49c9-b593-d223f7449a82>
+bumpbot <bumpbot@git.wordpress.org> <bumpbot@602fd350-edb4-49c9-b593-d223f7449a82>
+jverber <jverber@git.wordpress.org> <jverber@602fd350-edb4-49c9-b593-d223f7449a82>
+laurelfulford <laurelfulford@git.wordpress.org> <laurelfulford@602fd350-edb4-49c9-b593-d223f7449a82>
+luisherranz <luisherranz@git.wordpress.org> <luisherranz@602fd350-edb4-49c9-b593-d223f7449a82>
+michelvaldrighi <michelvaldrighi@git.wordpress.org> <michelvaldrighi@602fd350-edb4-49c9-b593-d223f7449a82>
+potbot <potbot@git.wordpress.org> <potbot@602fd350-edb4-49c9-b593-d223f7449a82>
+ramonopoly <ramonopoly@git.wordpress.org> <ramonopoly@602fd350-edb4-49c9-b593-d223f7449a82>
+rob1n <rob1n@git.wordpress.org> <rob1n@602fd350-edb4-49c9-b593-d223f7449a82>
+scribu <scribu@git.wordpress.org> <scribu@602fd350-edb4-49c9-b593-d223f7449a82>
+zieladam <zieladam@git.wordpress.org> <zieladam@602fd350-edb4-49c9-b593-d223f7449a82>
+
</ins></span></pre>
</div>
</div>

</body>
</html>