.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 <stefanbeller@googlemail.com> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Stefan Beller committed
Jul 14, 2013 at 12:14 UTC
f4f49e2258a250507baaa2c977a9fd7993ac07ad
1 file changed
+35
-7
.mailmap
+35
-7
@@ -17,6 +17,7 @@ Alexey Shumkin <alex.crezoff@gmail.com> <zapped@mail.ru>
17
Anders Kaseorg <andersk@MIT.EDU> <andersk@ksplice.com>
18
Anders Kaseorg <andersk@MIT.EDU> <andersk@mit.edu>
19
Aneesh Kumar K.V <aneesh.kumar@gmail.com>
20
+Ben Walton <bdwalton@gmail.com> <bwalton@artsci.utoronto.ca>
21
Bernt Hansen <bernt@norang.ca> <bernt@alumni.uwaterloo.ca>
22
Brandon Casey <drafnel@gmail.com> <casey@nrlssc.navy.mil>
23
Brian M. Carlson <sandals@crustytoothpaste.ath.cx>
@@ -24,6 +25,8 @@ Bryan Larsen <bryan@larsen.st> <bryan.larsen@gmail.com>
25
Bryan Larsen <bryan@larsen.st> <bryanlarsen@yahoo.com>
26
Cheng Renquan <crquan@gmail.com>
27
Chris Shoemaker <c.shoemaker@cox.net>
28
+Chris Wright <chrisw@sous-sol.org> <chrisw@osdl.org>
29
+Csaba Henk <csaba@gluster.com> <csaba@lowlife.hu>
30
Dan Johnson <computerdruid@gmail.com>
31
Dana L. How <danahow@gmail.com>
32
Dana L. How <how@deathvalley.cswitch.com>
@@ -44,8 +47,11 @@ Florian Achleitner <florian.achleitner.2.6.31@gmail.com> <florian.achleitner2.6.
47
Franck Bui-Huu <vagabon.xyz@gmail.com> <fbuihuu@gmail.com>
48
Frank Lichtenheld <frank@lichtenheld.de> <djpig@debian.org>
49
Frank Lichtenheld <frank@lichtenheld.de> <flichtenheld@astaro.com>
47
-Fredrik Kuivinen <freku045@student.liu.se>
50
+Fredrik Kuivinen <frekui@gmail.com> <freku045@student.liu.se>
51
Frédéric Heitzmann <frederic.heitzmann@gmail.com>
52
+Garry Dolley <gdolley@ucla.edu> <gdolley@arpnetworks.com>
53
+Greg Price <price@mit.edu> <price@MIT.EDU>
54
+Greg Price <price@mit.edu> <price@ksplice.com>
55
H. Merijn Brand <h.m.brand@xs4all.nl> H.Merijn Brand <h.m.brand@xs4all.nl>
56
H. Peter Anvin <hpa@zytor.com> <hpa@bonde.sc.orionmulti.com>
57
H. Peter Anvin <hpa@zytor.com> <hpa@smyrno.hos.anvin.org>
@@ -62,6 +68,7 @@ Jason Riedy <ejr@eecs.berkeley.edu> <ejr@cs.berkeley.edu>
68
Jay Soffian <jaysoffian@gmail.com> <jaysoffian+git@gmail.com>
69
Jeff King <peff@peff.net> <peff@github.com>
70
Jeff Muizelaar <jmuizelaar@mozilla.com> <jeff@infidigm.net>
71
+Jim Meyering <jim@meyering.net> <meyering@redhat.com>
72
Joachim Berdal Haga <cjhaga@fys.uio.no>
73
Johannes Schindelin <Johannes.Schindelin@gmx.de> <johannes.schindelin@gmx.de>
74
Johannes Sixt <j6t@kdbg.org> <J.Sixt@eudaptics.com>
@@ -95,6 +102,7 @@ Kirill Smelkov <kirr@navytux.spb.ru> <kirr@mns.spb.ru>
102
Knut Franke <Knut.Franke@gmx.de> <k.franke@science-computing.de>
103
Lars Doelle <lars.doelle@on-line ! de>
104
Lars Doelle <lars.doelle@on-line.de>
105
+Lars Noschinski <lars@public.noschinski.de> <lars.noschinski@rwth-aachen.de>
106
Li Hong <leehong@pku.edu.cn>
107
Linus Torvalds <torvalds@linux-foundation.org> <torvalds@evo.osdl.org>
108
Linus Torvalds <torvalds@linux-foundation.org> <torvalds@g5.osdl.org>
@@ -112,6 +120,7 @@ Martin Langhoff <martin@laptop.org> <martin@catalyst.net.nz>
120
Martin von Zweigbergk <martinvonz@gmail.com> <martin.von.zweigbergk@gmail.com>
121
Matt Draisey <matt@draisey.ca> <mattdraisey@sympatico.ca>
122
Matt Kraai <kraai@ftbfs.org> <matt.kraai@amo.abbott.com>
123
+Matt McCutchen <matt@mattmccutchen.net> <hashproduct@gmail.com>
124
Matthias Kestenholz <matthias@spinlock.ch> <mk@spinlock.ch>
125
Matthias Urlichs <matthias@urlichs.de> <smurf@kiste.(none)>
126
Matthias Urlichs <matthias@urlichs.de> <smurf@smurf.noris.de>
@@ -120,6 +129,7 @@ Michael J Gruber <git@drmicha.warpmail.net> <michaeljgruber+gmane@fastmail.fm>
129
Michael W. Olson <mwolson@gnu.org>
130
Michael Witten <mfwitten@gmail.com> <mfwitten@MIT.EDU>
131
Michael Witten <mfwitten@gmail.com> <mfwitten@mit.edu>
132
+Michal Rokos <michal.rokos@nextsoft.cz> <rokos@nextsoft.cz>
133
Michele Ballabio <barra_cuda@katamail.com>
134
Miklos Vajna <vmiklos@frugalware.org> <vmiklos@suse.cz>
135
Namhyung Kim <namhyung@gmail.com> <namhyung.kim@lge.com>
@@ -129,14 +139,19 @@ Nanako Shiraishi <nanako3@lavabit.com>
139
Nelson Elhage <nelhage@mit.edu> <nelhage@MIT.EDU>
140
Nelson Elhage <nelhage@mit.edu> <nelhage@ksplice.com>
141
Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
142
+Nick Stokoe <nick@noodlefactory.co.uk> Nick Woolley <nick@noodlefactory.co.uk>
143
+Nick Stokoe <nick@noodlefactory.co.uk> Nick Woolley <nickwoolley@yahoo.co.uk>
144
Nicolas Morey-Chaisemartin <devel-git@morey-chaisemartin.com> <nicolas.morey@free.fr>
145
Nicolas Morey-Chaisemartin <devel-git@morey-chaisemartin.com> <nmorey@kalray.eu>
146
+Nicolas Sebrecht <nicolas.s.dev@gmx.fr> <ni.s@laposte.net>
147
Paolo Bonzini <bonzini@gnu.org> <paolo.bonzini@lu.unisi.ch>
148
Pascal Obry <pascal@obry.net> <pascal.obry@gmail.com>
149
Pascal Obry <pascal@obry.net> <pascal.obry@wanadoo.fr>
150
Pat Notz <patnotz@gmail.com> <pknotz@sandia.gov>
151
Paul Mackerras <paulus@samba.org> <paulus@dorrigo.(none)>
152
Paul Mackerras <paulus@samba.org> <paulus@pogo.(none)>
153
+Peter Baumann <waste.manager@gmx.de> <Peter.B.Baumann@stud.informatik.uni-erlangen.de>
154
+Peter Baumann <waste.manager@gmx.de> <siprbaum@stud.informatik.uni-erlangen.de>
155
Peter Krefting <peter@softwolves.pp.se> <peter@softwolves.pp.se>
156
Peter Krefting <peter@softwolves.pp.se> <peter@svarten.intern.softwolves.pp.se>
157
Petr Baudis <pasky@ucw.cz> <pasky@suse.cz>
@@ -149,17 +164,24 @@ Ralf Thielow <ralf.thielow@gmail.com> <ralf.thielow@googlemail.com>
164
Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
165
René Scharfe <rene.scharfe@lsrfire.ath.cx>
166
Robert Fitzsimons <robfitz@273k.net>
167
+Robert Shearman <robertshearman@gmail.com> <rob@codeweavers.com>
168
Robert Zeh <robert.a.zeh@gmail.com>
169
Robin Rosenberg <robin.rosenberg@dewire.com> <robin.rosenberg.lists@dewire.com>
170
+Ryan Anderson <ryan@michonline.com> <rda@google.com>
171
Salikh Zakirov <salikh.zakirov@gmail.com> <Salikh.Zakirov@Intel.com>
172
Sam Vilain <sam@vilain.net> <sam.vilain@catalyst.net.nz>
173
Santi Béjar <santi@agolina.net> <sbejar@gmail.com>
174
Sean Estabrooks <seanlkml@sympatico.ca>
175
Sebastian Schuberth <sschuberth@gmail.com> <sschuberth@visageimaging.com>
176
+Seth Falcon <seth@userprimary.net> <sfalcon@fhcrc.org>
177
Shawn O. Pearce <spearce@spearce.org>
178
+Stefan Naewe <stefan.naewe@gmail.com> <stefan.naewe@atlas-elektronik.com>
179
+Stefan Naewe <stefan.naewe@gmail.com> <stefan.naewe@googlemail.com>
180
Stefan Sperling <stsp@elego.de> <stsp@stsp.name>
181
Stephen Boyd <bebarino@gmail.com> <sboyd@codeaurora.org>
182
Steven Grimm <koreth@midwinter.com> <sgrimm@sgrimm-mbp.local>
183
+Steven Walter <stevenrwalter@gmail.com> <swalter@lexmark.com>
184
+Steven Walter <stevenrwalter@gmail.com> <swalter@lpdev.prtdev.lexmark.com>
185
Sven Verdoolaege <skimo@kotnet.org> <Sven.Verdoolaege@cs.kuleuven.ac.be>
186
Sven Verdoolaege <skimo@kotnet.org> <skimo@liacs.nl>
187
Tay Ray Chuan <rctay89@gmail.com>
@@ -170,19 +192,25 @@ Thomas Rast <trast@inf.ethz.ch> <trast@student.ethz.ch>
192
Timo Hirvonen <tihirvon@gmail.com> <tihirvon@ee.oulu.fi>
193
Toby Allsopp <Toby.Allsopp@navman.co.nz> <toby.allsopp@navman.co.nz>
194
Tom Grennan <tmgrennan@gmail.com> <tgrennan@redback.com>
195
+Tommi Virtanen <tv@debian.org> <tv@eagain.net>
196
+Tommi Virtanen <tv@debian.org> <tv@inoi.fi>
197
+Tommy Thorn <tommy-git@thorn.ws> <tt1729@yahoo.com>
198
Tony Luck <tony.luck@intel.com>
199
+Tor Arne Vestbø <torarnv@gmail.com> <tavestbo@trolltech.com>
200
Trent Piepho <tpiepho@gmail.com> <tpiepho@freescale.com>
201
Trent Piepho <tpiepho@gmail.com> <xyzzy@speakeasy.org>
176
-Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
177
-Uwe Kleine-König <Uwe_Zeisberger@digi.com>
178
-Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
179
-Uwe Kleine-König <uzeisberger@io.fsforth.de>
180
-Uwe Kleine-König <zeisberg@informatik.uni-freiburg.de>
181
-Ville Skyttä <scop@xemacs.org>
202
+Uwe Kleine-König <u.kleine-koenig@pengutronix.de> <Uwe.Kleine-Koenig@digi.com>
203
+Uwe Kleine-König <u.kleine-koenig@pengutronix.de> <ukleinek@informatik.uni-freiburg.de>
204
+Uwe Kleine-König <u.kleine-koenig@pengutronix.de> <uzeisberger@io.fsforth.de>
205
+Uwe Kleine-König <u.kleine-koenig@pengutronix.de> <zeisberg@informatik.uni-freiburg.de>
206
+Ville Skyttä <ville.skytta@iki.fi> <scop@xemacs.org>
207
Vitaly "_Vi" Shukela <public_vi@tut.by>
208
W. Trevor King <wking@tremily.us> <wking@drexel.edu>
209
William Pursell <bill.pursell@gmail.com>
210
+YONETANI Tomokazu <y0n3t4n1@gmail.com> <qhwt+git@les.ath.cx>
211
+YONETANI Tomokazu <y0n3t4n1@gmail.com> <y0netan1@dragonflybsd.org>
212
YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
213
+# the two anonymous contributors are different persons:
214
anonymous <linux@horizon.com>
215
anonymous <linux@horizon.net>
216
İsmail Dönmez <ismail@pardus.org.tr>