.mailmap: match up some obvious names/emails
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 <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
50b03b04c0
commit
055e578766
10
.mailmap
10
.mailmap
@ -9,7 +9,9 @@ Alex Bennée <kernel-hacker@bennee.com>
|
|||||||
Alexander Gavrilov <angavrilov@gmail.com>
|
Alexander Gavrilov <angavrilov@gmail.com>
|
||||||
Aneesh Kumar K.V <aneesh.kumar@gmail.com>
|
Aneesh Kumar K.V <aneesh.kumar@gmail.com>
|
||||||
Brian M. Carlson <sandals@crustytoothpaste.ath.cx>
|
Brian M. Carlson <sandals@crustytoothpaste.ath.cx>
|
||||||
|
Cheng Renquan <crquan@gmail.com>
|
||||||
Chris Shoemaker <c.shoemaker@cox.net>
|
Chris Shoemaker <c.shoemaker@cox.net>
|
||||||
|
Dan Johnson <computerdruid@gmail.com>
|
||||||
Dana L. How <danahow@gmail.com>
|
Dana L. How <danahow@gmail.com>
|
||||||
Dana L. How <how@deathvalley.cswitch.com>
|
Dana L. How <how@deathvalley.cswitch.com>
|
||||||
Daniel Barkalow <barkalow@iabervon.org>
|
Daniel Barkalow <barkalow@iabervon.org>
|
||||||
@ -18,13 +20,16 @@ David Kågedal <davidk@lysator.liu.se>
|
|||||||
David S. Miller <davem@davemloft.net>
|
David S. Miller <davem@davemloft.net>
|
||||||
Deskin Miller <deskinm@umich.edu>
|
Deskin Miller <deskinm@umich.edu>
|
||||||
Dirk Süsserott <newsletter@dirk.my1.cc>
|
Dirk Süsserott <newsletter@dirk.my1.cc>
|
||||||
|
Eric S. Raymond <esr@thyrsus.com>
|
||||||
Erik Faye-Lund <kusmabite@gmail.com> <kusmabite@googlemail.com>
|
Erik Faye-Lund <kusmabite@gmail.com> <kusmabite@googlemail.com>
|
||||||
Fredrik Kuivinen <freku045@student.liu.se>
|
Fredrik Kuivinen <freku045@student.liu.se>
|
||||||
|
Frédéric Heitzmann <frederic.heitzmann@gmail.com>
|
||||||
H. Peter Anvin <hpa@bonde.sc.orionmulti.com>
|
H. Peter Anvin <hpa@bonde.sc.orionmulti.com>
|
||||||
H. Peter Anvin <hpa@tazenda.sc.orionmulti.com>
|
H. Peter Anvin <hpa@tazenda.sc.orionmulti.com>
|
||||||
H. Peter Anvin <hpa@trantor.hos.anvin.org>
|
H. Peter Anvin <hpa@trantor.hos.anvin.org>
|
||||||
Horst H. von Brand <vonbrand@inf.utfsm.cl>
|
Horst H. von Brand <vonbrand@inf.utfsm.cl>
|
||||||
İsmail Dönmez <ismail@pardus.org.tr>
|
İsmail Dönmez <ismail@pardus.org.tr>
|
||||||
|
Jakub Narębski <jnareb@gmail.com>
|
||||||
Jay Soffian <jaysoffian+git@gmail.com>
|
Jay Soffian <jaysoffian+git@gmail.com>
|
||||||
Joachim Berdal Haga <cjhaga@fys.uio.no>
|
Joachim Berdal Haga <cjhaga@fys.uio.no>
|
||||||
Johannes Sixt <j6t@kdbg.org> <johannes.sixt@telecom.at>
|
Johannes Sixt <j6t@kdbg.org> <johannes.sixt@telecom.at>
|
||||||
@ -41,11 +46,14 @@ Junio C Hamano <gitster@pobox.com> <junio@hera.kernel.org>
|
|||||||
Junio C Hamano <gitster@pobox.com> <junio@kernel.org>
|
Junio C Hamano <gitster@pobox.com> <junio@kernel.org>
|
||||||
Junio C Hamano <gitster@pobox.com> <junkio@cox.net>
|
Junio C Hamano <gitster@pobox.com> <junkio@cox.net>
|
||||||
Karl Hasselström <kha@treskal.com>
|
Karl Hasselström <kha@treskal.com>
|
||||||
|
Kevin Leung <kevinlsk@gmail.com>
|
||||||
Kent Engstrom <kent@lysator.liu.se>
|
Kent Engstrom <kent@lysator.liu.se>
|
||||||
Lars Doelle <lars.doelle@on-line ! de>
|
Lars Doelle <lars.doelle@on-line ! de>
|
||||||
Lars Doelle <lars.doelle@on-line.de>
|
Lars Doelle <lars.doelle@on-line.de>
|
||||||
Li Hong <leehong@pku.edu.cn>
|
Li Hong <leehong@pku.edu.cn>
|
||||||
Lukas Sandström <lukass@etek.chalmers.se>
|
Lukas Sandström <lukass@etek.chalmers.se>
|
||||||
|
Marc-André Lureau <marcandre.lureau@gmail.com>
|
||||||
|
Mark Rada <marada@uwaterloo.ca>
|
||||||
Martin Langhoff <martin@laptop.org>
|
Martin Langhoff <martin@laptop.org>
|
||||||
Martin von Zweigbergk <martinvonz@gmail.com> <martin.von.zweigbergk@gmail.com>
|
Martin von Zweigbergk <martinvonz@gmail.com> <martin.von.zweigbergk@gmail.com>
|
||||||
Michael Coleman <tutufan@gmail.com>
|
Michael Coleman <tutufan@gmail.com>
|
||||||
@ -63,11 +71,13 @@ Ralf Thielow <ralf.thielow@gmail.com> <ralf.thielow@googlemail.com>
|
|||||||
Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
|
Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
|
||||||
René Scharfe <rene.scharfe@lsrfire.ath.cx>
|
René Scharfe <rene.scharfe@lsrfire.ath.cx>
|
||||||
Robert Fitzsimons <robfitz@273k.net>
|
Robert Fitzsimons <robfitz@273k.net>
|
||||||
|
Robert Zeh <robert.a.zeh@gmail.com>
|
||||||
Sam Vilain <sam@vilain.net>
|
Sam Vilain <sam@vilain.net>
|
||||||
Santi Béjar <sbejar@gmail.com>
|
Santi Béjar <sbejar@gmail.com>
|
||||||
Sean Estabrooks <seanlkml@sympatico.ca>
|
Sean Estabrooks <seanlkml@sympatico.ca>
|
||||||
Shawn O. Pearce <spearce@spearce.org>
|
Shawn O. Pearce <spearce@spearce.org>
|
||||||
Steven Grimm <koreth@midwinter.com>
|
Steven Grimm <koreth@midwinter.com>
|
||||||
|
Tay Ray Chuan <rctay89@gmail.com>
|
||||||
Theodore Ts'o <tytso@mit.edu>
|
Theodore Ts'o <tytso@mit.edu>
|
||||||
Thomas Rast <trast@inf.ethz.ch> <trast@student.ethz.ch>
|
Thomas Rast <trast@inf.ethz.ch> <trast@student.ethz.ch>
|
||||||
Tony Luck <tony.luck@intel.com>
|
Tony Luck <tony.luck@intel.com>
|
||||||
|
Loading…
Reference in New Issue
Block a user