.mailmap: map different names with the same email address together
Pretty much one year ago (94b410bba864, Jul 12 2013, .mailmap: Map email addresses to names) I cleaned up the output of `git shortlog -sne` of git.git by writing a .mailmap file fot the git.git project. During the year Jens, Kazuki and Trần contributed to git.git using different names, but the same email address; unify them. Signed-off-by: Stefan Beller <stefanbeller@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Stefan Beller committed
Jul 10, 2014 at 14:48 UTC
398dd4bd039680ba98497fbedffa415a43583c16
1 file changed
+3
.mailmap
+3
@@ -85,6 +85,7 @@ Jeff King <peff@peff.net> <peff@github.com>
85
Jeff Muizelaar <jmuizelaar@mozilla.com> <jeff@infidigm.net>
86
Jens Axboe <axboe@kernel.dk> <axboe@suse.de>
87
Jens Axboe <axboe@kernel.dk> <jens.axboe@oracle.com>
88
+Jens Lindström <jl@opera.com> Jens Lindstrom <jl@opera.com>
89
Jim Meyering <jim@meyering.net> <meyering@redhat.com>
90
Joachim Berdal Haga <cjhaga@fys.uio.no>
91
Johannes Schindelin <Johannes.Schindelin@gmx.de> <johannes.schindelin@gmx.de>
@@ -113,6 +114,7 @@ Karsten Blees <blees@dcon.de> <karsten.blees@dcon.de>
114
Karsten Blees <blees@dcon.de> <karsten.blees@gmail.com>
115
Kay Sievers <kay.sievers@vrfy.org> <kay.sievers@suse.de>
116
Kay Sievers <kay.sievers@vrfy.org> <kay@mam.(none)>
117
+Kazuki Saitoh <ksaitoh560@gmail.com> kazuki saitoh <ksaitoh560@gmail.com>
118
Keith Cascio <keith@CS.UCLA.EDU> <keith@cs.ucla.edu>
119
Kent Engstrom <kent@lysator.liu.se>
120
Kevin Leung <kevinlsk@gmail.com>
@@ -229,6 +231,7 @@ Tommi Virtanen <tv@debian.org> <tv@inoi.fi>
231
Tommy Thorn <tommy-git@thorn.ws> <tt1729@yahoo.com>
232
Tony Luck <tony.luck@intel.com>
233
Tor Arne Vestbø <torarnv@gmail.com> <tavestbo@trolltech.com>
234
+Trần Ngọc Quân <vnwildman@gmail.com> Tran Ngoc Quan <vnwildman@gmail.com>
235
Trent Piepho <tpiepho@gmail.com> <tpiepho@freescale.com>
236
Trent Piepho <tpiepho@gmail.com> <xyzzy@speakeasy.org>
237
Uwe Kleine-König <u.kleine-koenig@pengutronix.de> <Uwe.Kleine-Koenig@digi.com>