From: "Martin Ågren" <martin.agren@gmail.com>
To: git@vger.kernel.org
Cc: Andreas Schwab <schwab@linux-m68k.org>,
Andreas Schwab <schwab@suse.de>,
Birger Skogeng Pedersen <birger.sp@gmail.com>,
Birger Skogeng Pedersen <birgersp@gmail.com>,
Brandon Williams <bwilliams.eng@gmail.com>,
Brandon Williams <bwilliamseng@gmail.com>,
Damien Robert <damien.olivier.robert+git@gmail.com>,
Damien Robert <damien.olivier.robert@gmail.com>,
Ed Maste <emaste@FreeBSD.org>, Ed Maste <emaste@freebsd.org>,
Fangyi Zhou <me@fangyi.io>, Fangyi Zhou <fangyi.zhou@yuriko.moe>,
Jiang Xin <worldhello.net@gmail.com>,
Jiang Xin <zhiyou.jx@alibaba-inc.com>,
Kevin Willford <Kevin.Willford@microsoft.com>,
Kevin Willford <kewillf@microsoft.com>,
Peter Kaestle <peter@piie.net>,
Peter Kaestle <peter.kaestle@nokia.com>,
Sun Chao <sunchao9@huawei.com>, Sun Chao <16657101987@163.com>,
Junio C Hamano <gitster@pobox.com>, Jeff King <peff@peff.net>
Subject: [PATCH v2] Update .mailmap
Date: Sun, 16 Aug 2020 17:30:37 +0200 [thread overview]
Message-ID: <20200816153037.1143576-1-martin.agren@gmail.com> (raw)
In-Reply-To: <20200805065408.1242617-1-martin.agren@gmail.com>
Similar to a35b13fce0 ("Update .mailmap", 2018-11-09), make the output
of `git shortlog -nse v2.10.0..master` duplicate-free by taking/guessing
the current and preferred addresses for authors that appear with more
than one address.
By request, don't add an entry for Andreas Schwab. For Brandon Williams,
use the e-mail address they gave in a62527b0e5 ("mailmap: update brandon
williams's email address", 2018-12-07). Peter Kaestle has used different
addresses to separate work-time and spare-time contributions, but
similar to 3fa0e04667 ("mailmap: add an additional email address for
brian m. carlson", 2020-02-20), has asked that we attribute those
commits to the same person.
Use the by far most common e-mail address:
* Jiang Xin
Use the most recent e-mail address:
* Birger Skogeng Pedersen
* Ed Maste
* Fangyi Zhou
* Kevin Willford
* Peter Kaestle
Use the one they used for their "Signed-off-by":
* Damien Robert
* Sun Chao
Acked-by: Ed Maste <emaste@FreeBSD.org>
Acked-by: Damien Robert <damien.olivier.robert+git@gmail.com>
Signed-off-by: Martin Ågren <martin.agren@gmail.com>
---
.mailmap | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/.mailmap b/.mailmap
index bde7aba756..f3b335af20 100644
--- a/.mailmap
+++ b/.mailmap
@@ -27,8 +27,10 @@ Ben Peart <benpeart@microsoft.com> <peartben@gmail.com>
Ben Walton <bdwalton@gmail.com> <bwalton@artsci.utoronto.ca>
Benoit Sigoure <tsunanet@gmail.com> <tsuna@lrde.epita.fr>
Bernt Hansen <bernt@norang.ca> <bernt@alumni.uwaterloo.ca>
+Birger Skogeng Pedersen <birger.sp@gmail.com> <birgersp@gmail.com>
Brandon Casey <drafnel@gmail.com> <casey@nrlssc.navy.mil>
Brandon Williams <bwilliams.eng@gmail.com> <bmwill@google.com>
+Brandon Williams <bwilliams.eng@gmail.com> <bwilliamseng@gmail.com>
brian m. carlson <sandals@crustytoothpaste.net>
brian m. carlson <sandals@crustytoothpaste.net> <sandals@crustytoothpaste.ath.cx>
brian m. carlson <sandals@crustytoothpaste.net> <bk2204@github.com>
@@ -45,6 +47,7 @@ Christopher Díaz Riveros <chrisadr@gentoo.org> Christopher Diaz Riveros
Clemens Buchacher <drizzd@gmx.net> <drizzd@aon.at>
Clemens Buchacher <drizzd@gmx.net> <clemens.buchacher@intel.com>
Csaba Henk <csaba@gluster.com> <csaba@lowlife.hu>
+Damien Robert <damien.olivier.robert+git@gmail.com> <damien.olivier.robert@gmail.com>
Dan Johnson <computerdruid@gmail.com>
Dana L. How <danahow@gmail.com> <how@deathvalley.cswitch.com>
Dana L. How <danahow@gmail.com> Dana How
@@ -64,13 +67,15 @@ Derrick Stolee <dstolee@microsoft.com> Derrick Stolee via GitGitGadget <gitgitga
Deskin Miller <deskinm@umich.edu>
Đoàn Trần Công Danh <congdanhqx@gmail.com> Doan Tran Cong Danh
Dirk Süsserott <newsletter@dirk.my1.cc>
+Ed Maste <emaste@FreeBSD.org> <emaste@freebsd.org>
Eric Blake <eblake@redhat.com> <ebb9@byu.net>
Eric Hanchrow <eric.hanchrow@gmail.com> <offby1@blarg.net>
Eric S. Raymond <esr@thyrsus.com>
Eric Wong <e@80x24.org> <normalperson@yhbt.net>
Erik Faye-Lund <kusmabite@gmail.com> <kusmabite@googlemail.com>
Eyvind Bernhardsen <eyvind.bernhardsen@gmail.com> <eyvind-git@orakel.ntnu.no>
-Fangyi Zhou <fangyi.zhou@yuriko.moe> Zhou Fangyi
+Fangyi Zhou <me@fangyi.io> <fangyi.zhou@yuriko.moe>
+Fangyi Zhou <me@fangyi.io> Zhou Fangyi <fangyi.zhou@yuriko.moe>
Florian Achleitner <florian.achleitner.2.6.31@gmail.com> <florian.achleitner2.6.31@gmail.com>
Franck Bui-Huu <vagabon.xyz@gmail.com> <fbuihuu@gmail.com>
Frank Lichtenheld <frank@lichtenheld.de> <djpig@debian.org>
@@ -107,6 +112,8 @@ Jeff Muizelaar <jmuizelaar@mozilla.com> <jeff@infidigm.net>
Jens Axboe <axboe@kernel.dk> <axboe@suse.de>
Jens Axboe <axboe@kernel.dk> <jens.axboe@oracle.com>
Jens Lindström <jl@opera.com> Jens Lindstrom <jl@opera.com>
+Jiang Xin <worldhello.net@gmail.com> <xin.jiang@huawei.com>
+Jiang Xin <worldhello.net@gmail.com> <zhiyou.jx@alibaba-inc.com>
Jim Meyering <jim@meyering.net> <meyering@redhat.com>
Joachim Berdal Haga <cjhaga@fys.uio.no>
Joachim Jablon <joachim.jablon@people-doc.com> <ewjoachim@gmail.com>
@@ -142,6 +149,7 @@ Kazuki Saitoh <ksaitoh560@gmail.com> kazuki saitoh <ksaitoh560@gmail.com>
Keith Cascio <keith@CS.UCLA.EDU> <keith@cs.ucla.edu>
Kent Engstrom <kent@lysator.liu.se>
Kevin Leung <kevinlsk@gmail.com>
+Kevin Willford <Kevin.Willford@microsoft.com> <kewillf@microsoft.com>
Kirill Smelkov <kirr@navytux.spb.ru> <kirr@landau.phys.spbu.ru>
Kirill Smelkov <kirr@navytux.spb.ru> <kirr@mns.spb.ru>
Knut Franke <Knut.Franke@gmx.de> <k.franke@science-computing.de>
@@ -209,6 +217,7 @@ Paul Mackerras <paulus@samba.org> <paulus@dorrigo.(none)>
Paul Mackerras <paulus@samba.org> <paulus@pogo.(none)>
Peter Baumann <waste.manager@gmx.de> <Peter.B.Baumann@stud.informatik.uni-erlangen.de>
Peter Baumann <waste.manager@gmx.de> <siprbaum@stud.informatik.uni-erlangen.de>
+Peter Kaestle <peter@piie.net> <peter.kaestle@nokia.com>
Peter Krefting <peter@softwolves.pp.se> <peter@softwolves.pp.se>
Peter Krefting <peter@softwolves.pp.se> <peter@svarten.intern.softwolves.pp.se>
Petr Baudis <pasky@ucw.cz> <pasky@suse.cz>
@@ -256,6 +265,7 @@ Steven Grimm <koreth@midwinter.com> <sgrimm@sgrimm-mbp.local>
Steven Grimm <koreth@midwinter.com> koreth@midwinter.com
Steven Walter <stevenrwalter@gmail.com> <swalter@lexmark.com>
Steven Walter <stevenrwalter@gmail.com> <swalter@lpdev.prtdev.lexmark.com>
+Sun Chao <sunchao9@huawei.com> <16657101987@163.com>
Sven Verdoolaege <skimo@kotnet.org> <Sven.Verdoolaege@cs.kuleuven.ac.be>
Sven Verdoolaege <skimo@kotnet.org> <skimo@liacs.nl>
SZEDER Gábor <szeder.dev@gmail.com> <szeder@ira.uka.de>
--
2.28.0.277.g9b3c35fffd
next prev parent reply other threads:[~2020-08-16 15:34 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-04 21:07 [PATCH] Update .mailmap Martin Ågren
2020-08-04 21:28 ` Jeff King
2020-08-04 22:01 ` Junio C Hamano
2020-08-05 6:53 ` Martin Ågren
2020-08-05 6:54 ` [PATCH RESEND] " Martin Ågren
2020-08-05 7:00 ` Andreas Schwab
2020-08-05 7:09 ` Martin Ågren
2020-08-05 16:12 ` Junio C Hamano
2020-08-08 9:11 ` Damien Robert
2020-08-09 22:38 ` Ed Maste
2020-08-16 15:30 ` Martin Ågren [this message]
2020-08-16 17:17 ` [PATCH v2] " Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200816153037.1143576-1-martin.agren@gmail.com \
--to=martin.agren@gmail.com \
--cc=16657101987@163.com \
--cc=Kevin.Willford@microsoft.com \
--cc=birger.sp@gmail.com \
--cc=birgersp@gmail.com \
--cc=bwilliams.eng@gmail.com \
--cc=bwilliamseng@gmail.com \
--cc=damien.olivier.robert+git@gmail.com \
--cc=damien.olivier.robert@gmail.com \
--cc=emaste@FreeBSD.org \
--cc=fangyi.zhou@yuriko.moe \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=kewillf@microsoft.com \
--cc=me@fangyi.io \
--cc=peff@peff.net \
--cc=peter.kaestle@nokia.com \
--cc=peter@piie.net \
--cc=schwab@linux-m68k.org \
--cc=schwab@suse.de \
--cc=sunchao9@huawei.com \
--cc=worldhello.net@gmail.com \
--cc=zhiyou.jx@alibaba-inc.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.