Skip to content

Commit 055e578

Browse files
peffgitster
authored andcommitted
.mailmap: match up some obvious names/emails
This patch updates git's .mailmap in cases where multiple names are matched to a single email. The "master" name for each email was chosen by: 1. If the only difference is in the presence or absence of accented characters, the accented form is chosen (under the assumption that it is the natural spelling, and accents are sometimes stripped in email). 2. Otherwise, the most commonly used name is chosen. 3. If all names are equally common, the most recently used name is chosen. Signed-off-by: Jeff King <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 50b03b0 commit 055e578

File tree

1 file changed

+10
-0
lines changed

1 file changed

+10
-0
lines changed

.mailmap

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ Alex Bennée <[email protected]>
99
Alexander Gavrilov <[email protected]>
1010
Aneesh Kumar K.V <[email protected]>
1111
Brian M. Carlson <[email protected]>
12+
Cheng Renquan <[email protected]>
1213
Chris Shoemaker <[email protected]>
14+
Dan Johnson <[email protected]>
1315
Dana L. How <[email protected]>
1416
Dana L. How <[email protected]>
1517
Daniel Barkalow <[email protected]>
@@ -18,13 +20,16 @@ David Kågedal <[email protected]>
1820
David S. Miller <[email protected]>
1921
Deskin Miller <[email protected]>
2022
Dirk Süsserott <[email protected]>
23+
Eric S. Raymond <[email protected]>
2124
2225
Fredrik Kuivinen <[email protected]>
26+
Frédéric Heitzmann <[email protected]>
2327
H. Peter Anvin <[email protected]>
2428
H. Peter Anvin <[email protected]>
2529
H. Peter Anvin <[email protected]>
2630
Horst H. von Brand <[email protected]>
2731
İsmail Dönmez <[email protected]>
32+
Jakub Narębski <[email protected]>
2833
Jay Soffian <[email protected]>
2934
Joachim Berdal Haga <[email protected]>
3035
@@ -41,11 +46,14 @@ Junio C Hamano <[email protected]> <[email protected]>
4146
4247
4348
Karl Hasselström <[email protected]>
49+
Kevin Leung <[email protected]>
4450
Kent Engstrom <[email protected]>
4551
Lars Doelle <lars.doelle@on-line ! de>
4652
Lars Doelle <[email protected]>
4753
4854
Lukas Sandström <[email protected]>
55+
Marc-André Lureau <[email protected]>
56+
Mark Rada <[email protected]>
4957
Martin Langhoff <[email protected]>
5058
Martin von Zweigbergk <[email protected]> <[email protected]>
5159
Michael Coleman <[email protected]>
@@ -63,11 +71,13 @@ Ralf Thielow <[email protected]> <[email protected]>
6371
Ramsay Allan Jones <[email protected]>
6472
René Scharfe <[email protected]>
6573
Robert Fitzsimons <[email protected]>
74+
Robert Zeh <[email protected]>
6675
Sam Vilain <[email protected]>
6776
Santi Béjar <[email protected]>
6877
Sean Estabrooks <[email protected]>
6978
Shawn O. Pearce <[email protected]>
7079
Steven Grimm <[email protected]>
80+
Tay Ray Chuan <[email protected]>
7181
Theodore Ts'o <[email protected]>
7282
7383
Tony Luck <[email protected]>

0 commit comments

Comments
 (0)