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 <[email protected]>
---
I'm cc-ing all involved authors. If you object or want to normalize your
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 <[email protected]>
Alexander Gavrilov <[email protected]>
Aneesh Kumar K.V <[email protected]>
Brian M. Carlson <[email protected]>
+Cheng Renquan <[email protected]>
Chris Shoemaker <[email protected]>
+Dan Johnson <[email protected]>
Dana L. How <[email protected]>
Dana L. How <[email protected]>
Daniel Barkalow <[email protected]>
@@ -18,13 +20,16 @@ Horst H. von Brand <[email protected]>
David S. Miller <[email protected]>
Deskin Miller <[email protected]>
Dirk Süsserott <[email protected]>
+Eric S. Raymond <[email protected]>
Erik Faye-Lund <[email protected]> <[email protected]>
Fredrik Kuivinen <[email protected]>
+Frédéric Heitzmann <[email protected]>
H. Peter Anvin <[email protected]>
H. Peter Anvin <[email protected]>
H. Peter Anvin <[email protected]>
Horst H. von Brand <[email protected]>
İsmail Dönmez <[email protected]>
+Jakub Narębski <[email protected]>
Jay Soffian <[email protected]>
Joachim Berdal Haga <[email protected]>
Johannes Sixt <[email protected]> <[email protected]>
@@ -41,11 +46,14 @@ Lukas Sandström <[email protected]>
Junio C Hamano <[email protected]> <[email protected]>
Junio C Hamano <[email protected]> <[email protected]>
Karl Hasselström <[email protected]>
+Kevin Leung <[email protected]>
Kent Engstrom <[email protected]>
Lars Doelle <lars.doelle@on-line ! de>
Lars Doelle <[email protected]>
Li Hong <[email protected]>
Lukas Sandström <[email protected]>
+Marc-André Lureau <[email protected]>
+Mark Rada <[email protected]>
Martin Langhoff <[email protected]>
Martin von Zweigbergk <[email protected]> <[email protected]>
Michael Coleman <[email protected]>
@@ -63,11 +71,13 @@ Steven Grimm <[email protected]>
Ramsay Allan Jones <[email protected]>
René Scharfe <[email protected]>
Robert Fitzsimons <[email protected]>
+Robert Zeh <[email protected]>
Sam Vilain <[email protected]>
Santi Béjar <[email protected]>
Sean Estabrooks <[email protected]>
Shawn O. Pearce <[email protected]>
Steven Grimm <[email protected]>
+Tay Ray Chuan <[email protected]>
Theodore Ts'o <[email protected]>
Thomas Rast <[email protected]> <[email protected]>
Tony Luck <[email protected]>
--
1.8.0.2.4.g59402aa
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
