<html xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:m="http://schemas.microsoft.com/office/2004/12/omml" xmlns="http://www.w3.org/TR/REC-html40">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="Generator" content="Microsoft Word 15 (filtered medium)">
<style><!--
/* Font Definitions */
@font-face
{font-family:"Cambria Math";
panose-1:2 4 5 3 5 4 6 3 2 4;}
@font-face
{font-family:Calibri;
panose-1:2 15 5 2 2 2 4 3 2 4;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin:0in;
font-size:11.0pt;
font-family:"Calibri",sans-serif;}
a:link, span.MsoHyperlink
{mso-style-priority:99;
color:blue;
text-decoration:underline;}
span.EmailStyle18
{mso-style-type:personal-reply;
font-family:"Calibri",sans-serif;
color:windowtext;}
.MsoChpDefault
{mso-style-type:export-only;
font-family:"Calibri",sans-serif;}
@page WordSection1
{size:8.5in 11.0in;
margin:1.0in 1.0in 1.0in 1.0in;}
div.WordSection1
{page:WordSection1;}
--></style><!--[if gte mso 9]><xml>
<o:shapedefaults v:ext="edit" spidmax="1026" />
</xml><![endif]--><!--[if gte mso 9]><xml>
<o:shapelayout v:ext="edit">
<o:idmap v:ext="edit" data="1" />
</o:shapelayout></xml><![endif]-->
</head>
<body lang="EN-US" link="blue" vlink="purple" style="word-wrap:break-word">
<div class="WordSection1">
<p class="MsoNormal">Offhand this seems like a good idea to me—as another example, someone might change companies and therefore email addresses, but it would be good to have a way to identify all contributions from the same person.<o:p></o:p></p>
<p class="MsoNormal"><o:p> </o:p></p>
<p class="MsoNormal">On the other hand… github IDs can have multiple addresses, is there a way to leverage that? But maybe github IDs are a github thing rather than a git thing, which makes that difficult?<o:p></o:p></p>
<p class="MsoNormal">--paulr<o:p></o:p></p>
<p class="MsoNormal"><o:p> </o:p></p>
<div style="border:none;border-left:solid blue 1.5pt;padding:0in 0in 0in 4.0pt">
<div>
<div style="border:none;border-top:solid #E1E1E1 1.0pt;padding:3.0pt 0in 0in 0in">
<p class="MsoNormal"><b>From:</b> cfe-dev <cfe-dev-bounces@lists.llvm.org> <b>On Behalf Of
</b>Nico Weber via cfe-dev<br>
<b>Sent:</b> Tuesday, May 25, 2021 9:31 AM<br>
<b>To:</b> llvm-dev <llvm-dev@lists.llvm.org>; cfe-dev <cfe-dev@lists.llvm.org><br>
<b>Subject:</b> [cfe-dev] Proposal: Adding a toplevel .mailmap file<o:p></o:p></p>
</div>
</div>
<p class="MsoNormal"><o:p> </o:p></p>
<div>
<p class="MsoNormal">Hi,<o:p></o:p></p>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
<div>
<p class="MsoNormal">I commit LLVM patches using two different email addresses. This means my changes show up as two lines in `git shortlog -nes <path>`, and `git log --author=thakis` only finds some of my changes. I know several others also use commit using
different email addresses.<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
<div>
<p class="MsoNormal">It's possible to add a file `.mailmap` to the root of the repo that tells git to merge different email addresses to the same person for display purposes (<a href="https://urldefense.com/v3/__https:/git-scm.com/docs/gitmailmap__;!!JmoZiZGBv3RvKRSx!tP5GjShGmoDCp9BanQE-t9ziaOL_xFjKcougap5sqbszoaFmjb_DUgTf5fjSgf-Vgw$">https://git-scm.com/docs/gitmailmap</a>).
For example, if that file exists and contains<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
<div>
<p class="MsoNormal"> Nico Weber <<a href="mailto:thakis@chromium.org">thakis@chromium.org</a>> <<a href="mailto:nicolasweber@gmx.de">nicolasweber@gmx.de</a>><o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
<div>
<p class="MsoNormal">then `git log --author=thakis` will show all my commits.<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
<div>
<p class="MsoNormal">I currently have that locally. Should we have this file checked in? Everybody who wanted could add their different aliases, and it gives people control over what they want to show as their primary email address. Linux for example has it
checked in: <a href="https://urldefense.com/v3/__https:/github.com/torvalds/linux/blob/master/.mailmap__;!!JmoZiZGBv3RvKRSx!tP5GjShGmoDCp9BanQE-t9ziaOL_xFjKcougap5sqbszoaFmjb_DUgTf5fipW-yJZw$">
https://github.com/torvalds/linux/blob/master/.mailmap</a><o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
<div>
<p class="MsoNormal">Nico<o:p></o:p></p>
</div>
</div>
</div>
</div>
</body>
</html>