From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeff King Subject: [PATCH 1/5] .mailmap: match up some obvious names/emails Date: Wed, 12 Dec 2012 06:36:35 -0500 Message-ID: <20121212113634.GA18803@sigill.intra.peff.net> References: <20121212113036.GB19625@sigill.intra.peff.net> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: Cheng Renquan , Dan Johnson , "Eric S. Raymond" , =?utf-8?B?RnLDqWTDqXJpYw==?= Heitzmann , Jakub =?utf-8?B?TmFyxJlic2tp?= , Kevin Leung , =?utf-8?Q?Marc-Andr=C3=A9?= Lureau , Mark Rada , Robert Zeh , Tay Ray Chuan To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Wed Dec 12 12:36:57 2012 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 1TikcT-0008Fk-5J for gcvg-git-2@plane.gmane.org; Wed, 12 Dec 2012 12:36:57 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751257Ab2LLLgk convert rfc822-to-quoted-printable (ORCPT ); Wed, 12 Dec 2012 06:36:40 -0500 Received: from 75-15-5-89.uvs.iplsin.sbcglobal.net ([75.15.5.89]:42799 "EHLO peff.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750985Ab2LLLgj (ORCPT ); Wed, 12 Dec 2012 06:36:39 -0500 Received: (qmail 23192 invoked by uid 107); 12 Dec 2012 11:37:41 -0000 Received: from sigill.intra.peff.net (HELO sigill.intra.peff.net) (10.0.0.7) (smtp-auth username relayok, mechanism cram-md5) by peff.net (qpsmtpd/0.84) with ESMTPA; Wed, 12 Dec 2012 06:37:41 -0500 Received: by sigill.intra.peff.net (sSMTP sendmail emulation); Wed, 12 Dec 2012 06:36:35 -0500 Content-Disposition: inline In-Reply-To: <20121212113036.GB19625@sigill.intra.peff.net> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: This patch updates git's .mailmap in cases where multiple names are matched to a single email. The "master" name for each email was chosen by: 1. If the only difference is in the presence or absence of accented characters, the accented form is chosen (under the assumption that it is the natural spelling, and accents are sometimes stripped in email). 2. Otherwise, the most commonly used name is chosen. 3. If all names are equally common, the most recently used name is chosen. Signed-off-by: Jeff King --- I'm cc-ing all involved authors. If you object or want to normalize you= r name in some other way, please let me know. .mailmap | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.mailmap b/.mailmap index bcf4f87..69301bd 100644 --- a/.mailmap +++ b/.mailmap @@ -9,7 +9,9 @@ Chris Shoemaker Alexander Gavrilov Aneesh Kumar K.V Brian M. Carlson +Cheng Renquan Chris Shoemaker +Dan Johnson Dana L. How Dana L. How Daniel Barkalow @@ -18,13 +20,16 @@ Horst H. von Brand David S. Miller Deskin Miller Dirk S=C3=BCsserott +Eric S. Raymond Erik Faye-Lund Fredrik Kuivinen +Fr=C3=A9d=C3=A9ric Heitzmann H. Peter Anvin H. Peter Anvin H. Peter Anvin Horst H. von Brand =C4=B0smail D=C3=B6nmez +Jakub Nar=C4=99bski Jay Soffian Joachim Berdal Haga Johannes Sixt @@ -41,11 +46,14 @@ Lukas Sandstr=C3=B6m Junio C Hamano Junio C Hamano Karl Hasselstr=C3=B6m +Kevin Leung Kent Engstrom Lars Doelle Lars Doelle Li Hong Lukas Sandstr=C3=B6m +Marc-Andr=C3=A9 Lureau +Mark Rada Martin Langhoff Martin von Zweigbergk Michael Coleman @@ -63,11 +71,13 @@ Steven Grimm Ramsay Allan Jones Ren=C3=A9 Scharfe Robert Fitzsimons +Robert Zeh Sam Vilain Santi B=C3=A9jar Sean Estabrooks Shawn O. Pearce Steven Grimm +Tay Ray Chuan Theodore Ts'o Thomas Rast Tony Luck --=20 1.8.0.2.4.g59402aa