Skip to content

Commit dcb1fb5

Browse files
committed
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 #7180 Discussed in https://core.trac.wordpress.org/ticket/61864 Fixes #61864. git-svn-id: https://develop.svn.wordpress.org/trunk@58899 602fd350-edb4-49c9-b593-d223f7449a82
1 parent 1b48ae6 commit dcb1fb5

File tree

1 file changed

+124
-0
lines changed

1 file changed

+124
-0
lines changed

.mailmap

Lines changed: 124 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,124 @@
1+
# Aliases names and emails inside of commits.
2+
# See https://git-scm.com/docs/gitmailmap
3+
#
4+
# Some entries appear as duplicates, but are both required to correct
5+
# identities with just the wrong name as well as those with the wrong
6+
# name and also the wrong email address.
7+
8+
Aaron D. Campbell <[email protected]> <aaroncampbell@602fd350-edb4-49c9-b593-d223f7449a82>
9+
Aaron Jorbin <[email protected]> <jorbin@602fd350-edb4-49c9-b593-d223f7449a82>
10+
Adam Silverstein <[email protected]> <adamsilverstein@602fd350-edb4-49c9-b593-d223f7449a82>
11+
Alex King <[email protected]> <alexkingorg@602fd350-edb4-49c9-b593-d223f7449a82>
12+
Alex Shiels <[email protected]> <tellyworth@602fd350-edb4-49c9-b593-d223f7449a82>
13+
14+
André <[email protected]> <oandregal@602fd350-edb4-49c9-b593-d223f7449a82>
15+
Andrea Fercia <[email protected]> <afercia@602fd350-edb4-49c9-b593-d223f7449a82>
16+
Andrew Duthie <[email protected]> <aduth@602fd350-edb4-49c9-b593-d223f7449a82>
17+
Andrew Nacin <[email protected]> <nacin@602fd350-edb4-49c9-b593-d223f7449a82>
18+
Andrew Ozz <[email protected]> <azaozz@602fd350-edb4-49c9-b593-d223f7449a82>
19+
Anthony Burchell <[email protected]> <antpb@602fd350-edb4-49c9-b593-d223f7449a82>
20+
Anton Timmermans <[email protected]> <atimmer@602fd350-edb4-49c9-b593-d223f7449a82>
21+
Bernie Reiter <[email protected]>
22+
Bernie Reiter <[email protected]> <bernhard-reiter@602fd350-edb4-49c9-b593-d223f7449a82>
23+
Boone Gorges <[email protected]> <boonebgorges@602fd350-edb4-49c9-b593-d223f7449a82>
24+
Carlos Bravo <[email protected]> <cbravobernal@602fd350-edb4-49c9-b593-d223f7449a82>
25+
Colin Stewart <[email protected]> <costdev@602fd350-edb4-49c9-b593-d223f7449a82>
26+
Daniel Bachhuber <[email protected]> <danielbachhuber@602fd350-edb4-49c9-b593-d223f7449a82>
27+
Daniel Richards <[email protected]> <talldanwp@602fd350-edb4-49c9-b593-d223f7449a82>
28+
Daryl Koopersmith <[email protected]> <koop@602fd350-edb4-49c9-b593-d223f7449a82>
29+
David A. Kennedy <[email protected]> <davidakennedy@602fd350-edb4-49c9-b593-d223f7449a82>
30+
David Baumwald <[email protected]> <davidbaumwald@602fd350-edb4-49c9-b593-d223f7449a82>
31+
Dennis Snell <[email protected]> <dmsnell@602fd350-edb4-49c9-b593-d223f7449a82>
32+
Dion Hulse <[email protected]> <dd32@602fd350-edb4-49c9-b593-d223f7449a82>
33+
Dominik Schilling <[email protected]>
34+
Dominik Schilling <[email protected]> <ocean90@602fd350-edb4-49c9-b593-d223f7449a82>
35+
Donncha O Caoimh <[email protected]> <donncha@602fd350-edb4-49c9-b593-d223f7449a82>
36+
Dougal Campbell <[email protected]> <dougal@602fd350-edb4-49c9-b593-d223f7449a82>
37+
Drew Jaynes <[email protected]>
38+
Drew Jaynes <[email protected]> <DrewAPicture@602fd350-edb4-49c9-b593-d223f7449a82>
39+
Drew Jaynes <[email protected]> <drewapicture@602fd350-edb4-49c9-b593-d223f7449a82>
40+
41+
Ella <[email protected]> <ellatrix@602fd350-edb4-49c9-b593-d223f7449a82>
42+
Ella <[email protected]> <iseulde@602fd350-edb4-49c9-b593-d223f7449a82>
43+
44+
Eric Andrew Lewis <[email protected]> <ericlewis@602fd350-edb4-49c9-b593-d223f7449a82>
45+
Felix Arntz <[email protected]> <flixos90@602fd350-edb4-49c9-b593-d223f7449a82>
46+
Gary Pendergast <[email protected]> <pento@602fd350-edb4-49c9-b593-d223f7449a82>
47+
Greg Ziółkowski <[email protected]>
48+
Greg Ziółkowski <[email protected]> <gziolo@602fd350-edb4-49c9-b593-d223f7449a82>
49+
Helen Hou-Sandi <[email protected]> <helen@602fd350-edb4-49c9-b593-d223f7449a82>
50+
Ian Belanger <[email protected]> <ianbelanger@602fd350-edb4-49c9-b593-d223f7449a82>
51+
Ian Dunn <[email protected]> <iandunn@602fd350-edb4-49c9-b593-d223f7449a82>
52+
Ian Stewart <[email protected]> <iandstewart@602fd350-edb4-49c9-b593-d223f7449a82>
53+
Isabel Brison <[email protected]> <isabel_brison@602fd350-edb4-49c9-b593-d223f7449a82>
54+
Jake Spurlock <[email protected]> <whyisjake@602fd350-edb4-49c9-b593-d223f7449a82>
55+
James Nylen <[email protected]> <jnylen0@602fd350-edb4-49c9-b593-d223f7449a82>
56+
Jb Audras <[email protected]> <audrasjb@602fd350-edb4-49c9-b593-d223f7449a82>
57+
Jeff Ong <[email protected]> <jffng@602fd350-edb4-49c9-b593-d223f7449a82>
58+
Jeremy Felt <[email protected]> <jeremyfelt@602fd350-edb4-49c9-b593-d223f7449a82>
59+
Joe Dolson <[email protected]> <joedolson@602fd350-edb4-49c9-b593-d223f7449a82>
60+
Joe Hoyle <[email protected]> <joehoyle@602fd350-edb4-49c9-b593-d223f7449a82>
61+
Joe McGill <[email protected]> <joemcgill@602fd350-edb4-49c9-b593-d223f7449a82>
62+
John Blackbourn <[email protected]> <johnbillion@602fd350-edb4-49c9-b593-d223f7449a82>
63+
John James Jacoby <[email protected]> <johnjamesjacoby@602fd350-edb4-49c9-b593-d223f7449a82>
64+
Jon Cave <[email protected]> <duck_@602fd350-edb4-49c9-b593-d223f7449a82>
65+
Jonathan Desrosiers <[email protected]> <desrosj@602fd350-edb4-49c9-b593-d223f7449a82>
66+
Jonny Harris <[email protected]> <spacedmonkey@602fd350-edb4-49c9-b593-d223f7449a82>
67+
Jorge Costa <[email protected]> <jorgefilipecosta@602fd350-edb4-49c9-b593-d223f7449a82>
68+
Joseph Scott <[email protected]> <josephscott@602fd350-edb4-49c9-b593-d223f7449a82>
69+
Juliette Reinders Folmer <[email protected]>
70+
Juliette Reinders Folmer <[email protected]> <jrf@602fd350-edb4-49c9-b593-d223f7449a82>
71+
K. Adam White <[email protected]> <kadamwhite@602fd350-edb4-49c9-b593-d223f7449a82>
72+
Kelly Choyce-Dwan <[email protected]>
73+
Kelly Choyce-Dwan <[email protected]> <ryelle@602fd350-edb4-49c9-b593-d223f7449a82>
74+
Konstantin Kovshenin <[email protected]> <kovshenin@602fd350-edb4-49c9-b593-d223f7449a82>
75+
Konstantin Obenland <[email protected]>
76+
Konstantin Obenland <[email protected]> <obenland@602fd350-edb4-49c9-b593-d223f7449a82>
77+
Lance Willett <[email protected]> <lancewillett@602fd350-edb4-49c9-b593-d223f7449a82>
78+
Marius L. J <[email protected]> <clorith@602fd350-edb4-49c9-b593-d223f7449a82>
79+
Mark Jaquith <[email protected]> <markjaquith@602fd350-edb4-49c9-b593-d223f7449a82>
80+
Matias Ventura <[email protected]> <matveb@602fd350-edb4-49c9-b593-d223f7449a82>
81+
Matt Mullenweg <[email protected]> <matt@602fd350-edb4-49c9-b593-d223f7449a82>
82+
Matt Thomas <[email protected]> <iammattthomas@602fd350-edb4-49c9-b593-d223f7449a82>
83+
Mel Choyce <[email protected]> <melchoyce@602fd350-edb4-49c9-b593-d223f7449a82>
84+
Michael Adams <[email protected]>
85+
Michael Adams <[email protected]> <mdawaffe@602fd350-edb4-49c9-b593-d223f7449a82>
86+
Michael Arestad <[email protected]> <michael-arestad@602fd350-edb4-49c9-b593-d223f7449a82>
87+
Michal Czaplinski <[email protected]> <czapla@602fd350-edb4-49c9-b593-d223f7449a82>
88+
Miguel Fonseca <[email protected]> <mcsf@602fd350-edb4-49c9-b593-d223f7449a82>
89+
Mike Little <[email protected]> <mikelittle@602fd350-edb4-49c9-b593-d223f7449a82>
90+
Mike Schroder <[email protected]> <mikeschroder@602fd350-edb4-49c9-b593-d223f7449a82>
91+
Nikolay Bachiyski <[email protected]> <nbachiyski@602fd350-edb4-49c9-b593-d223f7449a82>
92+
Omar Reiss <[email protected]> <omarreiss@602fd350-edb4-49c9-b593-d223f7449a82>
93+
Pascal Birchler <[email protected]> <swissspidy@602fd350-edb4-49c9-b593-d223f7449a82>
94+
Pete Mall <[email protected]> <petemall@602fd350-edb4-49c9-b593-d223f7449a82>
95+
Peter Westwood <[email protected]> <westi@602fd350-edb4-49c9-b593-d223f7449a82>
96+
Peter Wilson <[email protected]> <peterwilsoncc@602fd350-edb4-49c9-b593-d223f7449a82>
97+
Rachel Baker <[email protected]> <rachelbaker@602fd350-edb4-49c9-b593-d223f7449a82>
98+
Riad Benguella <[email protected]> <youknowriad@602fd350-edb4-49c9-b593-d223f7449a82>
99+
Robert Anderson <[email protected]> <noisysocks@602fd350-edb4-49c9-b593-d223f7449a82>
100+
Ron Rennick <[email protected]> <wpmuguru@602fd350-edb4-49c9-b593-d223f7449a82>
101+
Ryan Boren <[email protected]> <ryan@602fd350-edb4-49c9-b593-d223f7449a82>
102+
Ryan McCue <[email protected]> <rmccue@602fd350-edb4-49c9-b593-d223f7449a82>
103+
Scott Taylor <[email protected]> <wonderboymusic@602fd350-edb4-49c9-b593-d223f7449a82>
104+
Sergey Biryukov <[email protected]> <SergeyBiryukov@602fd350-edb4-49c9-b593-d223f7449a82>
105+
Sergey Biryukov <[email protected]> <sergeybiryukov@602fd350-edb4-49c9-b593-d223f7449a82>
106+
Tammie Lister <[email protected]>
107+
Tammie Lister <[email protected]> <karmatosed@602fd350-edb4-49c9-b593-d223f7449a82>
108+
Timothy Jacobs <[email protected]> <TimothyBlynJacobs@602fd350-edb4-49c9-b593-d223f7449a82>
109+
Timothy Jacobs <[email protected]> <timothyblynjacobs@602fd350-edb4-49c9-b593-d223f7449a82>
110+
Tonya Mork <[email protected]> <hellofromTonya@602fd350-edb4-49c9-b593-d223f7449a82>
111+
112+
Weston Ruter <[email protected]> <westonruter@602fd350-edb4-49c9-b593-d223f7449a82>
113+
allancole <[email protected]> <allancole@602fd350-edb4-49c9-b593-d223f7449a82>
114+
bumpbot <[email protected]> <bumpbot@602fd350-edb4-49c9-b593-d223f7449a82>
115+
jverber <[email protected]> <jverber@602fd350-edb4-49c9-b593-d223f7449a82>
116+
laurelfulford <[email protected]> <laurelfulford@602fd350-edb4-49c9-b593-d223f7449a82>
117+
luisherranz <[email protected]> <luisherranz@602fd350-edb4-49c9-b593-d223f7449a82>
118+
michelvaldrighi <[email protected]> <michelvaldrighi@602fd350-edb4-49c9-b593-d223f7449a82>
119+
potbot <[email protected]> <potbot@602fd350-edb4-49c9-b593-d223f7449a82>
120+
ramonopoly <[email protected]> <ramonopoly@602fd350-edb4-49c9-b593-d223f7449a82>
121+
rob1n <[email protected]> <rob1n@602fd350-edb4-49c9-b593-d223f7449a82>
122+
scribu <[email protected]> <scribu@602fd350-edb4-49c9-b593-d223f7449a82>
123+
zieladam <[email protected]> <zieladam@602fd350-edb4-49c9-b593-d223f7449a82>
124+

0 commit comments

Comments
 (0)