mirrored from git://develop.git.wordpress.org/
-
Notifications
You must be signed in to change notification settings - Fork 2.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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
- Loading branch information
Showing
1 changed file
with
124 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,124 @@ | ||
| # 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 <[email protected]> <aaroncampbell@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Aaron Jorbin <[email protected]> <jorbin@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Adam Silverstein <[email protected]> <adamsilverstein@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Alex King <[email protected]> <alexkingorg@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Alex Shiels <[email protected]> <tellyworth@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| André <[email protected]> | ||
| André <[email protected]> <oandregal@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Andrea Fercia <[email protected]> <afercia@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Andrew Duthie <[email protected]> <aduth@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Andrew Nacin <[email protected]> <nacin@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Andrew Ozz <[email protected]> <azaozz@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Anthony Burchell <[email protected]> <antpb@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Anton Timmermans <[email protected]> <atimmer@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Bernie Reiter <[email protected]> | ||
| Bernie Reiter <[email protected]> <bernhard-reiter@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Boone Gorges <[email protected]> <boonebgorges@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Carlos Bravo <[email protected]> <cbravobernal@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Colin Stewart <[email protected]> <costdev@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Daniel Bachhuber <[email protected]> <danielbachhuber@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Daniel Richards <[email protected]> <talldanwp@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Daryl Koopersmith <[email protected]> <koop@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| David A. Kennedy <[email protected]> <davidakennedy@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| David Baumwald <[email protected]> <davidbaumwald@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Dennis Snell <[email protected]> <dmsnell@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Dion Hulse <[email protected]> <dd32@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Dominik Schilling <[email protected]> | ||
| Dominik Schilling <[email protected]> <ocean90@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Donncha O Caoimh <[email protected]> <donncha@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Dougal Campbell <[email protected]> <dougal@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Drew Jaynes <[email protected]> | ||
| Drew Jaynes <[email protected]> <DrewAPicture@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Drew Jaynes <[email protected]> <drewapicture@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Ella <[email protected]> | ||
| Ella <[email protected]> <ellatrix@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Ella <[email protected]> <iseulde@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Ella <[email protected]> <[email protected]> | ||
| Eric Andrew Lewis <[email protected]> <ericlewis@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Felix Arntz <[email protected]> <flixos90@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Gary Pendergast <[email protected]> <pento@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Greg Ziółkowski <[email protected]> | ||
| Greg Ziółkowski <[email protected]> <gziolo@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Helen Hou-Sandi <[email protected]> <helen@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Ian Belanger <[email protected]> <ianbelanger@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Ian Dunn <[email protected]> <iandunn@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Ian Stewart <[email protected]> <iandstewart@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Isabel Brison <[email protected]> <isabel_brison@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Jake Spurlock <[email protected]> <whyisjake@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| James Nylen <[email protected]> <jnylen0@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Jb Audras <[email protected]> <audrasjb@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Jeff Ong <[email protected]> <jffng@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Jeremy Felt <[email protected]> <jeremyfelt@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Joe Dolson <[email protected]> <joedolson@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Joe Hoyle <[email protected]> <joehoyle@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Joe McGill <[email protected]> <joemcgill@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| John Blackbourn <[email protected]> <johnbillion@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| John James Jacoby <[email protected]> <johnjamesjacoby@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Jon Cave <[email protected]> <duck_@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Jonathan Desrosiers <[email protected]> <desrosj@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Jonny Harris <[email protected]> <spacedmonkey@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Jorge Costa <[email protected]> <jorgefilipecosta@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Joseph Scott <[email protected]> <josephscott@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Juliette Reinders Folmer <[email protected]> | ||
| Juliette Reinders Folmer <[email protected]> <jrf@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| K. Adam White <[email protected]> <kadamwhite@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Kelly Choyce-Dwan <[email protected]> | ||
| Kelly Choyce-Dwan <[email protected]> <ryelle@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Konstantin Kovshenin <[email protected]> <kovshenin@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Konstantin Obenland <[email protected]> | ||
| Konstantin Obenland <[email protected]> <obenland@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Lance Willett <[email protected]> <lancewillett@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Marius L. J <[email protected]> <clorith@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Mark Jaquith <[email protected]> <markjaquith@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Matias Ventura <[email protected]> <matveb@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Matt Mullenweg <[email protected]> <matt@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Matt Thomas <[email protected]> <iammattthomas@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Mel Choyce <[email protected]> <melchoyce@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Michael Adams <[email protected]> | ||
| Michael Adams <[email protected]> <mdawaffe@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Michael Arestad <[email protected]> <michael-arestad@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Michal Czaplinski <[email protected]> <czapla@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Miguel Fonseca <[email protected]> <mcsf@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Mike Little <[email protected]> <mikelittle@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Mike Schroder <[email protected]> <mikeschroder@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Nikolay Bachiyski <[email protected]> <nbachiyski@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Omar Reiss <[email protected]> <omarreiss@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Pascal Birchler <[email protected]> <swissspidy@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Pete Mall <[email protected]> <petemall@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Peter Westwood <[email protected]> <westi@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Peter Wilson <[email protected]> <peterwilsoncc@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Rachel Baker <[email protected]> <rachelbaker@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Riad Benguella <[email protected]> <youknowriad@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Robert Anderson <[email protected]> <noisysocks@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Ron Rennick <[email protected]> <wpmuguru@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Ryan Boren <[email protected]> <ryan@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Ryan McCue <[email protected]> <rmccue@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Scott Taylor <[email protected]> <wonderboymusic@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Sergey Biryukov <[email protected]> <SergeyBiryukov@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Sergey Biryukov <[email protected]> <sergeybiryukov@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Tammie Lister <[email protected]> | ||
| Tammie Lister <[email protected]> <karmatosed@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Timothy Jacobs <[email protected]> <TimothyBlynJacobs@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Timothy Jacobs <[email protected]> <timothyblynjacobs@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Tonya Mork <[email protected]> <hellofromTonya@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| Tonya Mork <[email protected]> <[email protected]> | ||
| Weston Ruter <[email protected]> <westonruter@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| allancole <[email protected]> <allancole@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| bumpbot <[email protected]> <bumpbot@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| jverber <[email protected]> <jverber@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| laurelfulford <[email protected]> <laurelfulford@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| luisherranz <[email protected]> <luisherranz@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| michelvaldrighi <[email protected]> <michelvaldrighi@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| potbot <[email protected]> <potbot@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| ramonopoly <[email protected]> <ramonopoly@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| rob1n <[email protected]> <rob1n@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| scribu <[email protected]> <scribu@602fd350-edb4-49c9-b593-d223f7449a82> | ||
| zieladam <[email protected]> <zieladam@602fd350-edb4-49c9-b593-d223f7449a82> | ||
|
|