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 <xin.jiang@huawei.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 RESEND] Update .mailmap
Date: Wed, 5 Aug 2020 08:54:08 +0200 [thread overview]
Message-ID: <20200805065408.1242617-1-martin.agren@gmail.com> (raw)
In-Reply-To: <xmqqy2muqddg.fsf@gitster.c.googlers.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.
Use the by far most common e-mail address:
* Brandon Williams
* Jiang Xin
Use the most recent e-mail address:
* Andreas Schwab
* Birger Skogeng Pedersen
* Ed Maste
* Fangyi Zhou
* Kevin Willford
* Peter Kaestle
Use the one from their "Signed-off-by":
* Damien Robert
* Sun Chao
Signed-off-by: Martin Ågren <martin.agren@gmail.com>
---
Ack? I'll collect Acks/Naks into the beginning of next week.
.mailmap | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/.mailmap b/.mailmap
index bde7aba756..b4e6eb7dd7 100644
--- a/.mailmap
+++ b/.mailmap
@@ -18,6 +18,7 @@ Alexey Shumkin <alex.crezoff@gmail.com> <zapped@mail.ru>
Alexey Shumkin <alex.crezoff@gmail.com> <Alex.Crezoff@gmail.com>
Anders Kaseorg <andersk@MIT.EDU> <andersk@ksplice.com>
Anders Kaseorg <andersk@MIT.EDU> <andersk@mit.edu>
+Andreas Schwab <schwab@linux-m68k.org> <schwab@suse.de>
Andrey Mazo <ahippo@yandex.com> Mazo, Andrey <amazo@checkvideo.com>
Aneesh Kumar K.V <aneesh.kumar@gmail.com>
Amos Waterland <apw@debian.org> <apw@rossby.metr.ou.edu>
@@ -27,8 +28,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 +48,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 +68,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 +113,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 +150,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>
@@ -213,6 +222,7 @@ 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>
Petr Baudis <pasky@ucw.cz> <xpasky@machine>
+Peter Kaestle <peter@piie.net> <peter.kaestle@nokia.com>
Phil Hord <hordp@cisco.com> <phil.hord@gmail.com>
Philip Jägenstedt <philip@foolip.org> <philip.jagenstedt@gmail.com>
Philip Oakley <philipoakley@iee.email> <philipoakley@iee.org> # secondary <philipoakley@dunelm.org.uk>
@@ -256,6 +266,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.236.gb10cc79966
next prev parent reply other threads:[~2020-08-05 6:56 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-04 21:07 [PATCH] " 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 ` Martin Ågren [this message]
2020-08-05 7:00 ` [PATCH RESEND] " 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 ` [PATCH v2] " Martin Ågren
2020-08-16 17:17 ` 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200805065408.1242617-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=xin.jiang@huawei.com \
--cc=zhiyou.jx@alibaba-inc.com \
--subject='Re: [PATCH RESEND] Update .mailmap' \
/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
Code repositories for project(s) associated with this inbox:
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).