From 398dd4bd039680ba98497fbedffa415a43583c16 Mon Sep 17 00:00:00 2001 From: Stefan Beller Date: Thu, 10 Jul 2014 14:48:26 +0200 Subject: [PATCH] .mailmap: map different names with the same email address together MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Junio C Hamano --- .mailmap | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.mailmap b/.mailmap index 11057cbcdf..2edbeb5406 100644 --- a/.mailmap +++ b/.mailmap @@ -85,6 +85,7 @@ Jeff King Jeff Muizelaar Jens Axboe Jens Axboe +Jens Lindström Jens Lindstrom Jim Meyering Joachim Berdal Haga Johannes Schindelin @@ -113,6 +114,7 @@ Karsten Blees Karsten Blees Kay Sievers Kay Sievers +Kazuki Saitoh kazuki saitoh Keith Cascio Kent Engstrom Kevin Leung @@ -229,6 +231,7 @@ Tommi Virtanen Tommy Thorn Tony Luck Tor Arne Vestbø +Trần Ngọc Quân Tran Ngoc Quan Trent Piepho Trent Piepho Uwe Kleine-König -- 2.11.4.GIT