From: Fangyi Zhou <me@fangyi.io>
To: git@vger.kernel.org
Cc: "Fangyi Zhou" <me@fangyi.io>,
"Birger Skogeng Pedersen" <birger.sp@gmail.com>,
"Birger Skogeng Pedersen" <birgersp@gmail.com>,
"Brandon Williams" <bwilliamseng@gmail.com>,
"Brandon Williams" <bmwill@google.com>,
"CB Bailey" <cbailey32@bloomberg.net>,
"Christopher Díaz Riveros" <christopher.diaz.riv@gmail.com>,
"Christopher Díaz Riveros" <chrisadr@gentoo.org>,
"Ed Maste" <emaste@FreeBSD.org>,
"Jean-Noël Avila" <jn.avila@free.fr>,
"Jean-Noel Avila" <jean-noel.avila@scantech.fr>,
"Jessica Clarke" <jrtc27@jrtc27.com>,
"Jiang Xin" <worldhello.net@gmail.com>,
"Jiang Xin" <zhiyou.jx@alibaba-inc.com>,
"Kazuhiro Kato" <kato-k@ksysllc.co.jp>,
"Kazuhiro Kato" <kazuhiro.kato@hotmail.co.jp>,
"Kevin Willford" <Kevin.Willford@microsoft.com>,
"Kevin Willford" <kewillf@microsoft.com>,
"Peter Kaestle" <peter@piie.net>,
"Peter Kaestle" <peter.kaestle@nokia.com>,
"Sibi Siddharthan" <sibisiddharthan.github@gmail.com>,
"Sibi Siddharthan" <sibisiv.siddharthan@gmail.com>,
"Slavica Đukić" <slawica92@hotmail.com>,
"Slavica Djukic" <slavicadj.ip2018@gmail.com>
Subject: [PATCH] .mailmap: Update mailmap
Date: Fri, 10 Sep 2021 14:02:36 +0100 [thread overview]
Message-ID: <20210910130236.40101-1-me@fangyi.io> (raw)
Similar to a35b13fce0 (Update .mailmap, 2018-11-09).
This patch makes 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.
Updated from <20200805065408.1242617-1-martin.agren@gmail.com>,
taking into consideration of <xmqqsgcm4ij5.fsf@gitster.c.googlers.com>,
and other replies.
Use the by far most common e-mail address:
* Brandon Williams
* Jiang Xin
Use the most recent e-mail address:
* Birger Skogeng Pedersen
* Christopher Díaz Riveros
* Ed Maste
* Fangyi Zhou
* Jean-Noël Avila
* Kevin Willford
* Peter Kaestle
Use the one from their "Signed-off-by":
* Damien Robert
* Kazuhiro Kato
* Sibi Siddharthan
Use the most recent name / name with correct accents:
* CB Bailey
* Christopher Díaz Riveros
* Jessica Clarke
* Slavica Đukić
Do not merge:
* Andreas Schwab
Signed-off-by: Fangyi Zhou <me@fangyi.io>
---
Please let me know if you approve those changes or not.
If no reply is received, the entry will be added in comments.
---
.mailmap | 23 +++++++++++++++++++++--
1 file changed, 21 insertions(+), 2 deletions(-)
diff --git a/.mailmap b/.mailmap
index 9c6a446bdf..ff0887d9e0 100644
--- a/.mailmap
+++ b/.mailmap
@@ -27,13 +27,16 @@ 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 <bwilliamseng@gmail.com> <bmwill@google.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>
Bryan Larsen <bryan@larsen.st> <bryan.larsen@gmail.com>
Bryan Larsen <bryan@larsen.st> <bryanlarsen@yahoo.com>
+CB Bailey <cbailey32@bloomberg.net> Charles Bailey
Cheng Renquan <crquan@gmail.com>
Chris Shoemaker <c.shoemaker@cox.net>
Chris Wright <chrisw@sous-sol.org> <chrisw@osdl.org>
@@ -41,10 +44,12 @@ Christian Ludwig <chrissicool@gmail.com> <chrissicool@googlemail.com>
Cord Seele <cowose@gmail.com> <cowose@googlemail.com>
Christian Couder <chriscool@tuxfamily.org> <christian.couder@gmail.com>
Christian Stimming <stimming@tuhh.de> <chs@ckiste.goetheallee>
-Christopher Díaz Riveros <chrisadr@gentoo.org> Christopher Diaz Riveros
+Christopher Díaz Riveros <christopher.diaz.riv@gmail.com> <chrisadr@gentoo.org>
+Christopher Díaz Riveros <christopher.diaz.riv@gmail.com> 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 +69,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>
@@ -102,11 +109,14 @@ Jason Riedy <ejr@eecs.berkeley.edu> <ejr@cs.berkeley.edu>
Jay Soffian <jaysoffian@gmail.com> <jaysoffian+git@gmail.com>
Jean-Noël Avila <jn.avila@free.fr> Jean-Noel Avila
Jean-Noël Avila <jn.avila@free.fr> Jean-Noël AVILA
+Jean-Noël Avila <jn.avila@free.fr> Jean-Noel Avila <jean-noel.avila@scantech.fr>
Jeff King <peff@peff.net> <peff@github.com>
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>
+Jessica Clarke <jrtc27@jrtc27.com> James Clarke
+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>
@@ -138,10 +148,12 @@ Karsten Blees <blees@dcon.de> <karsten.blees@dcon.de>
Karsten Blees <blees@dcon.de> <karsten.blees@gmail.com>
Kay Sievers <kay.sievers@vrfy.org> <kay.sievers@suse.de>
Kay Sievers <kay.sievers@vrfy.org> <kay@mam.(none)>
+Kazuhiro Kato <kato-k@ksysllc.co.jp> <kazuhiro.kato@hotmail.co.jp>
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>
@@ -211,6 +223,7 @@ Peter Baumann <waste.manager@gmx.de> <Peter.B.Baumann@stud.informatik.uni-erlang
Peter Baumann <waste.manager@gmx.de> <siprbaum@stud.informatik.uni-erlangen.de>
Peter Krefting <peter@softwolves.pp.se> <peter@softwolves.pp.se>
Peter Krefting <peter@softwolves.pp.se> <peter@svarten.intern.softwolves.pp.se>
+Peter Kaestle <peter@piie.net> <peter.kaestle@nokia.com>
Petr Baudis <pasky@ucw.cz> <pasky@suse.cz>
Petr Baudis <pasky@ucw.cz> <xpasky@machine>
Phil Hord <hordp@cisco.com> <phil.hord@gmail.com>
@@ -242,9 +255,11 @@ Sebastian Schuberth <sschuberth@gmail.com> <sschuberth@visageimaging.com>
Seth Falcon <seth@userprimary.net> <sfalcon@fhcrc.org>
Shawn O. Pearce <spearce@spearce.org>
Wei Shuyu <wsy@dogben.com> Shuyu Wei
+Sibi Siddharthan <sibisiddharthan.github@gmail.com> <sibisiv.siddharthan@gmail.com>
Sidhant Sharma <tigerkid001@gmail.com> Sidhant Sharma [:tk]
Simon Hausmann <hausmann@kde.org> <simon@lst.de>
Simon Hausmann <hausmann@kde.org> <shausman@trolltech.com>
+Slavica Đukić <slawica92@hotmail.com> Slavica Djukic <slavicadj.ip2018@gmail.com>
Stefan Beller <stefanbeller@gmail.com> <stefanbeller@googlemail.com>
Stefan Beller <stefanbeller@gmail.com> <sbeller@google.com>
Stefan Naewe <stefan.naewe@gmail.com> <stefan.naewe@atlas-elektronik.com>
@@ -296,3 +311,7 @@ Yi-Jyun Pan <pan93412@gmail.com>
anonymous <linux@horizon.com>
anonymous <linux@horizon.net>
İsmail Dönmez <ismail@pardus.org.tr>
+
+# Do not merge
+# Andreas Schwab <schwab@linux-m68k.org>
+# Andreas Schwab <schwab@suse.de>
--
2.32.0
next reply other threads:[~2021-09-10 13:02 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-10 13:02 Fangyi Zhou [this message]
2021-09-10 15:22 ` [PATCH] .mailmap: Update mailmap Gwyneth Morgan
2021-09-10 15:31 ` Jeff King
2021-09-10 15:35 ` Sibi Siddharthan
2021-09-11 0:32 ` Junio C Hamano
2021-09-11 1:31 ` Ævar Arnfjörð Bjarmason
2021-09-11 14:52 ` Jeff King
2021-09-11 14:47 ` Jeff King
2021-09-10 16:48 ` Oddidies in the .mailmap parser & future syntax extensions Ævar Arnfjörð Bjarmason
2021-09-10 18:11 ` Junio C Hamano
2021-09-10 19:50 ` Ævar Arnfjörð Bjarmason
2021-09-10 20:20 ` Junio C Hamano
2021-09-13 4:02 ` Ævar Arnfjörð Bjarmason
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=20210910130236.40101-1-me@fangyi.io \
--to=me@fangyi.io \
--cc=Kevin.Willford@microsoft.com \
--cc=birger.sp@gmail.com \
--cc=birgersp@gmail.com \
--cc=bmwill@google.com \
--cc=bwilliamseng@gmail.com \
--cc=cbailey32@bloomberg.net \
--cc=chrisadr@gentoo.org \
--cc=christopher.diaz.riv@gmail.com \
--cc=emaste@FreeBSD.org \
--cc=git@vger.kernel.org \
--cc=jean-noel.avila@scantech.fr \
--cc=jn.avila@free.fr \
--cc=jrtc27@jrtc27.com \
--cc=kato-k@ksysllc.co.jp \
--cc=kazuhiro.kato@hotmail.co.jp \
--cc=kewillf@microsoft.com \
--cc=peter.kaestle@nokia.com \
--cc=peter@piie.net \
--cc=sibisiddharthan.github@gmail.com \
--cc=sibisiv.siddharthan@gmail.com \
--cc=slavicadj.ip2018@gmail.com \
--cc=slawica92@hotmail.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.
Code repositories for project(s) associated with this public 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).