From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefan Beller Subject: [PATCH] .mailmap: Combine more (email, name) to individual persons Date: Sun, 14 Jul 2013 12:14:59 +0200 Message-ID: <1373796899-23378-2-git-send-email-stefanbeller@googlemail.com> References: <1373796899-23378-1-git-send-email-stefanbeller@googlemail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: Stefan Beller To: git@vger.kernel.org, gitster@pobox.com X-From: git-owner@vger.kernel.org Sun Jul 14 12:15:34 2013 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1UyJL2-0000A3-Tl for gcvg-git-2@plane.gmane.org; Sun, 14 Jul 2013 12:15:33 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751251Ab3GNKPZ convert rfc822-to-quoted-printable (ORCPT ); Sun, 14 Jul 2013 06:15:25 -0400 Received: from mail-wg0-f54.google.com ([74.125.82.54]:35391 "EHLO mail-wg0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750974Ab3GNKPA (ORCPT ); Sun, 14 Jul 2013 06:15:00 -0400 Received: by mail-wg0-f54.google.com with SMTP id n11so9184077wgh.21 for ; Sun, 14 Jul 2013 03:14:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=EaOucch8Rfq03lXLDxj9yjf3/fDCOeCLXTXZHAXIaoA=; b=tYtOi8miwSoVaeuLkv/cMsZBAq/q0HnJ/P6euM9pVIuWaHL3D5OzsUaHWvLVaa4Trg QmawoytCSX1jxL0iTKRMOz0n4w4mLkpF+3usf10txnzoWR+javSBjTztWq1joi1Nrfbl qexwOcn1RonfPky7+eUpKHqy4t7BBPuaSpHiuFoYaeC9IlRHzUoYPJ7apU+7WU+NyW96 scGSwhDhCHVr33KXhf7UGsJRWGvTBW18LqmLwAUFY0MrxL6NeoxpwsgCXdt9Vz01OT8j CWuRsrlhJfwqZxCOIPldSpZM2Z3r21ZVThYBbeGwHOkfE/vb4DX2aG47UBpxc08RGPeZ HtHA== X-Received: by 10.180.37.133 with SMTP id y5mr5985212wij.30.1373796899082; Sun, 14 Jul 2013 03:14:59 -0700 (PDT) Received: from localhost (ip-109-91-109-128.unitymediagroup.de. [109.91.109.128]) by mx.google.com with ESMTPSA id z6sm13553311wiv.11.2013.07.14.03.14.57 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sun, 14 Jul 2013 03:14:58 -0700 (PDT) X-Mailer: git-send-email 1.8.3.2.804.g0da7a53.dirty In-Reply-To: <1373796899-23378-1-git-send-email-stefanbeller@googlemail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: 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 emai= l. Signed-off-by: Stefan Beller --- .mailmap | 42 +++++++++++++++++++++++++++++++++++------- 1 file changed, 35 insertions(+), 7 deletions(-) diff --git a/.mailmap b/.mailmap index 22d3d70..9430d14 100644 --- a/.mailmap +++ b/.mailmap @@ -17,6 +17,7 @@ Alexey Shumkin Anders Kaseorg Anders Kaseorg Aneesh Kumar K.V +Ben Walton Bernt Hansen Brandon Casey Brian M. Carlson @@ -24,6 +25,8 @@ Bryan Larsen Bryan Larsen Cheng Renquan Chris Shoemaker +Chris Wright +Csaba Henk Dan Johnson Dana L. How Dana L. How @@ -44,8 +47,11 @@ Florian Achleitner Frank Lichtenheld Frank Lichtenheld -Fredrik Kuivinen +Fredrik Kuivinen Fr=C3=A9d=C3=A9ric Heitzmann +Garry Dolley +Greg Price +Greg Price H. Merijn Brand H.Merijn Brand H. Peter Anvin H. Peter Anvin @@ -62,6 +68,7 @@ Jason Riedy Jay Soffian Jeff King Jeff Muizelaar +Jim Meyering Joachim Berdal Haga Johannes Schindelin Johannes Sixt @@ -95,6 +102,7 @@ Kirill Smelkov Knut Franke Lars Doelle Lars Doelle +Lars Noschinski Li Hong Linus Torvalds Linus Torvalds @@ -112,6 +120,7 @@ Martin Langhoff Martin von Zweigbergk Matt Draisey Matt Kraai +Matt McCutchen Matthias Kestenholz Matthias Urlichs Matthias Urlichs @@ -120,6 +129,7 @@ Michael J Gruber Michael W. Olson Michael Witten Michael Witten +Michal Rokos Michele Ballabio Miklos Vajna Namhyung Kim @@ -129,14 +139,19 @@ Nanako Shiraishi Nelson Elhage Nelson Elhage Nguy=E1=BB=85n Th=C3=A1i Ng=E1=BB=8Dc Duy +Nick Stokoe Nick Woolley +Nick Stokoe Nick Woolley Nicolas Morey-Chaisemartin Nicolas Morey-Chaisemartin +Nicolas Sebrecht Paolo Bonzini Pascal Obry Pascal Obry Pat Notz Paul Mackerras Paul Mackerras +Peter Baumann +Peter Baumann Peter Krefting Peter Krefting Petr Baudis @@ -149,17 +164,24 @@ Ralf Thielow Ramsay Allan Jones Ren=C3=A9 Scharfe Robert Fitzsimons +Robert Shearman Robert Zeh Robin Rosenberg +Ryan Anderson Salikh Zakirov Sam Vilain Santi B=C3=A9jar Sean Estabrooks Sebastian Schuberth +Seth Falcon Shawn O. Pearce +Stefan Naewe +Stefan Naewe Stefan Sperling Stephen Boyd Steven Grimm +Steven Walter +Steven Walter Sven Verdoolaege Sven Verdoolaege Tay Ray Chuan @@ -170,19 +192,25 @@ Thomas Rast Timo Hirvonen Toby Allsopp Tom Grennan +Tommi Virtanen +Tommi Virtanen +Tommy Thorn Tony Luck +Tor Arne Vestb=C3=B8 Trent Piepho Trent Piepho -Uwe Kleine-K=C3=B6nig -Uwe Kleine-K=C3=B6nig -Uwe Kleine-K=C3=B6nig -Uwe Kleine-K=C3=B6nig -Uwe Kleine-K=C3=B6nig -Ville Skytt=C3=A4 +Uwe Kleine-K=C3=B6nig +Uwe Kleine-K=C3=B6nig +Uwe Kleine-K=C3=B6nig +Uwe Kleine-K=C3=B6nig +Ville Skytt=C3=A4 Vitaly "_Vi" Shukela W. Trevor King William Pursell +YONETANI Tomokazu +YONETANI Tomokazu YOSHIFUJI Hideaki +# the two anonymous contributors are different persons: anonymous anonymous =C4=B0smail D=C3=B6nmez --=20 1.8.3.2.804.g0da7a53.dirty