Skip to content

Commit f4f49e2

Browse files
stefanbellergitster
authored andcommitted
.mailmap: Combine more (email, name) to individual persons
I got more responses from people regarding the .mailmap file. All added persons gave permission to add them to the .mailmap file. It's mostly email mappings again. However we also have Nick Stokoe, who contributed as Nick Woolley. He changed his name, but kept the email. Signed-off-by: Stefan Beller <[email protected]> Reviewed-by: Jonathan Nieder <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 94b410b commit f4f49e2

File tree

1 file changed

+35
-7
lines changed

1 file changed

+35
-7
lines changed

.mailmap

Lines changed: 35 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,16 @@ Alexey Shumkin <[email protected]> <[email protected]>
1717
1818
1919
Aneesh Kumar K.V <[email protected]>
20+
2021
2122
2223
Brian M. Carlson <[email protected]>
2324
2425
2526
Cheng Renquan <[email protected]>
2627
Chris Shoemaker <[email protected]>
28+
29+
2730
Dan Johnson <[email protected]>
2831
Dana L. How <[email protected]>
2932
Dana L. How <[email protected]>
@@ -44,8 +47,11 @@ Florian Achleitner <[email protected]> <florian.achleitner2.6.
4447
4548
4649
47-
Fredrik Kuivinen <[email protected]>
50+
4851
Frédéric Heitzmann <[email protected]>
52+
53+
54+
4955
H. Merijn Brand <[email protected]> H.Merijn Brand <[email protected]>
5056
5157
@@ -62,6 +68,7 @@ Jason Riedy <[email protected]> <[email protected]>
6268
6369
6470
71+
6572
Joachim Berdal Haga <[email protected]>
6673
Johannes Schindelin <[email protected]> <[email protected]>
6774
@@ -95,6 +102,7 @@ Kirill Smelkov <[email protected]> <[email protected]>
95102
96103
Lars Doelle <lars.doelle@on-line ! de>
97104
Lars Doelle <[email protected]>
105+
98106
99107
100108
@@ -112,6 +120,7 @@ Martin Langhoff <[email protected]> <[email protected]>
112120
Martin von Zweigbergk <[email protected]> <[email protected]>
113121
114122
123+
115124
Matthias Kestenholz <[email protected]> <[email protected]>
116125
Matthias Urlichs <[email protected]> <smurf@kiste.(none)>
117126
@@ -120,6 +129,7 @@ Michael J Gruber <[email protected]> <[email protected]>
120129
Michael W. Olson <[email protected]>
121130
122131
132+
123133
Michele Ballabio <[email protected]>
124134
125135
@@ -129,14 +139,19 @@ Nanako Shiraishi <[email protected]>
129139
130140
131141
Nguyễn Thái Ngọc Duy <[email protected]>
142+
Nick Stokoe <[email protected]> Nick Woolley <[email protected]>
143+
Nick Stokoe <[email protected]> Nick Woolley <[email protected]>
132144
Nicolas Morey-Chaisemartin <[email protected]> <[email protected]>
133145
Nicolas Morey-Chaisemartin <[email protected]> <[email protected]>
146+
134147
135148
136149
137150
138151
Paul Mackerras <[email protected]> <paulus@dorrigo.(none)>
139152
Paul Mackerras <[email protected]> <paulus@pogo.(none)>
153+
154+
140155
141156
142157
@@ -149,17 +164,24 @@ Ralf Thielow <[email protected]> <[email protected]>
149164
Ramsay Allan Jones <[email protected]>
150165
René Scharfe <[email protected]>
151166
Robert Fitzsimons <[email protected]>
167+
152168
Robert Zeh <[email protected]>
153169
170+
154171
155172
156173
157174
Sean Estabrooks <[email protected]>
158175
Sebastian Schuberth <[email protected]> <[email protected]>
176+
159177
Shawn O. Pearce <[email protected]>
178+
179+
160180
161181
162182
183+
184+
163185
164186
165187
Tay Ray Chuan <[email protected]>
@@ -170,19 +192,25 @@ Thomas Rast <[email protected]> <[email protected]>
170192
171193
172194
195+
196+
197+
173198
Tony Luck <[email protected]>
199+
174200
175201
176-
Uwe Kleine-König <[email protected]>
177-
Uwe Kleine-König <[email protected]>
178-
Uwe Kleine-König <[email protected]>
179-
Uwe Kleine-König <[email protected]>
180-
Uwe Kleine-König <[email protected]>
181-
Ville Skyttä <[email protected]>
202+
203+
204+
205+
206+
182207
Vitaly "_Vi" Shukela <[email protected]>
183208
184209
William Pursell <[email protected]>
210+
211+
185212
YOSHIFUJI Hideaki <[email protected]>
213+
# the two anonymous contributors are different persons:
186214
anonymous <[email protected]>
187215
anonymous <[email protected]>
188216
İsmail Dönmez <[email protected]>

0 commit comments

Comments
 (0)