Skip to content

Commit ddf43b5

Browse files
authored
Rollup merge of #43157 - zackmdavis:mail_map, r=steveklabnik
update .mailmap It's nice to have an up-to-date .mailmap so that contributor listings (like those provided by `git shortlog` or http://thanks.rust-lang.org/) don't split the same author's contributions across two or more variations of their name. Affected contributors— @Aaronepower (3 commits as "Aaron Power", 1 as "Aaronepower") @djrollins (5 commits as "Daniel J Rollins", 1 as "Daniel Rollins") @eddyb (345 commits as "Eduard-Mihai Burtescu", 678 as "Eduard Burtescu", assuming former is canonical based on recency and GitHub profile display name) @edunham (1 more recent commit contradicts existing .mailmap entry) @GuillaumeGomez (942 commits as "Guillaume Gomez", 55 commits as "ggomez", 22 commits as "GuillaumeGomez") @jonathandturner (362 commits as "Jonathan Turner", 1 as "jonathandturner") @Mark-Simulacrum (248 commits as "Mark Simulacrum", 97 "Mark-Simulacrum") @fiveop (1 commit each as "Philipp Matthias Schäfer" and "Philipp Matthias Schaefer", assuming former is canonical based on GitHub profile display name) @shyaamsundhar (1 commit as "Shyam Sundar B", 3 as ShyamSundarB, assuming former is canonical based on recency) @steveklabnik (1634 commits as "Steve Klabnik", 41 as "steveklabnik")
2 parents 8dc69ff + bc8733f commit ddf43b5

File tree

1 file changed

+11
-1
lines changed

1 file changed

+11
-1
lines changed

.mailmap

+11-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#
77

88
Aaron Todd <[email protected]>
9+
Aaron Power <[email protected]>
910
Abhishek Chanda <[email protected]> Abhishek Chanda <[email protected]>
1011
Adolfo Ochagavía <[email protected]>
1112
Adrien Tétar <[email protected]>
@@ -56,18 +57,20 @@ Corey Richardson <[email protected]> Elaine "See More" Nemo <[email protected]>
5657
Cyryl Płotnicki <[email protected]>
5758
Damien Schoof <[email protected]>
5859
Daniel Ramos <[email protected]>
60+
Daniel J Rollins <[email protected]>
5961
David Klein <[email protected]>
6062
6163
David Ross <[email protected]>
6264
Derek Chiang <[email protected]> Derek Chiang (Enchi Jiang) <[email protected]>
6365
Diggory Hardy <[email protected]> Diggory Hardy <[email protected]>
6466
6567
Dzmitry Malyshau <[email protected]>
68+
6669
Eduardo Bautista <[email protected]> <=>
6770
71+
Eduard-Mihai Burtescu <[email protected]>
6872
6973
Elly Fong-Jones <[email protected]>
70-
Emily Dunham <[email protected]> edunham <[email protected]>
7174
7275
7376
Eric Holmes <[email protected]>
@@ -83,6 +86,8 @@ Gareth Daniel Smith <[email protected]> Gareth Smith <garethdanielsmit
8386
8487
Graham Fawcett <[email protected]> Graham Fawcett <[email protected]>
8588
Graydon Hoare <[email protected]> Graydon Hoare <[email protected]>
89+
Guillaume Gomez <[email protected]>
90+
Guillaume Gomez <[email protected]> ggomez <[email protected]>
8691
Guillaume Gomez <[email protected]> Guillaume Gomez <[email protected]>
8792
8893
@@ -114,6 +119,7 @@ John Kåre Alsaker <[email protected]>
114119
John Talling <[email protected]>
115120
116121
Jonathan S <[email protected]> Jonathan S <[email protected]>
122+
Jonathan Turner <[email protected]>
117123
118124
Joseph Martin <[email protected]>
119125
João Oliveira <[email protected]> joaoxsouls <[email protected]>
@@ -136,6 +142,7 @@ NAKASHIMA, Makoto <[email protected]> <[email protected]>
136142
137143
Marcell Pardavi <[email protected]>
138144
Margaret Meyerhofer <[email protected]> <mmeyerho@andrew>
145+
Mark Simulacrum <[email protected]>
139146
Mark Sinclair <[email protected]>
140147
Mark Sinclair <[email protected]> =Mark Sinclair <[email protected]>
141148
Markus Westerlind <[email protected]> Markus <[email protected]>
@@ -171,6 +178,7 @@ Peter Zotov <[email protected]>
171178
Phil Dawes <[email protected]> Phil Dawes <[email protected]>
172179
Philipp Brüschweiler <[email protected]> <[email protected]>
173180
Philipp Brüschweiler <[email protected]> <[email protected]>
181+
Philipp Matthias Schäfer <[email protected]>
174182
Przemysław Wesołek <[email protected]> Przemek Wesołek <[email protected]>
175183
Rafael Ávila de Espíndola <[email protected]> Rafael Avila de Espindola <espindola@dream.(none)>
176184
Ralph Giles <[email protected]> Ralph Giles <[email protected]>
@@ -189,11 +197,13 @@ S Pradeep Kumar <[email protected]>
189197
Scott Olson <[email protected]> Scott Olson <[email protected]>
190198
Sean Gillespie <[email protected]> swgillespie <[email protected]>
191199
Seonghyun Kim <[email protected]>
200+
Shyam Sundar B <[email protected]>
192201
Simon Barber-Dueck <[email protected]> Simon BD <simon@server>
193202
194203
Simonas Kazlauskas <[email protected]> Simonas Kazlauskas <[email protected]>
195204
startling <[email protected]>
196205
Stepan Koltsov <[email protected]> Stepan Koltsov <[email protected]>
206+
Steve Klabnik <[email protected]>
197207
198208
Steven Stewart-Gallus <[email protected]> <[email protected]>
199209
Stuart Pernsteiner <[email protected]> Stuart Pernsteiner <[email protected]>

0 commit comments

Comments
 (0)