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@xxxxxxxxxxx>
Acked-by: Damien Robert <damien.olivier.robert+git@xxxxxxxxx>
Signed-off-by: Martin Ågren <martin.agren@xxxxxxxxx>
---
.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@xxxxxxxxxxxxx> <peartben@xxxxxxxxx>
Ben Walton <bdwalton@xxxxxxxxx> <bwalton@xxxxxxxxxxxxxxxxxx>
Benoit Sigoure <tsunanet@xxxxxxxxx> <tsuna@xxxxxxxxxxxxx>
Bernt Hansen <bernt@xxxxxxxxx> <bernt@xxxxxxxxxxxxxxxxxxx>
+Birger Skogeng Pedersen <birger.sp@xxxxxxxxx> <birgersp@xxxxxxxxx>
Brandon Casey <drafnel@xxxxxxxxx> <casey@xxxxxxxxxxxxxxx>
Brandon Williams <bwilliams.eng@xxxxxxxxx> <bmwill@xxxxxxxxxx>
+Brandon Williams <bwilliams.eng@xxxxxxxxx> <bwilliamseng@xxxxxxxxx>
brian m. carlson <sandals@xxxxxxxxxxxxxxxxxxxx>
brian m. carlson <sandals@xxxxxxxxxxxxxxxxxxxx> <sandals@xxxxxxxxxxxxxxxxxxxxxxx>
brian m. carlson <sandals@xxxxxxxxxxxxxxxxxxxx> <bk2204@xxxxxxxxxx>
@@ -45,6 +47,7 @@ Christopher Díaz Riveros <chrisadr@xxxxxxxxxx> Christopher Diaz Riveros
Clemens Buchacher <drizzd@xxxxxxx> <drizzd@xxxxxx>
Clemens Buchacher <drizzd@xxxxxxx> <clemens.buchacher@xxxxxxxxx>
Csaba Henk <csaba@xxxxxxxxxxx> <csaba@xxxxxxxxxx>
+Damien Robert <damien.olivier.robert+git@xxxxxxxxx> <damien.olivier.robert@xxxxxxxxx>
Dan Johnson <computerdruid@xxxxxxxxx>
Dana L. How <danahow@xxxxxxxxx> <how@xxxxxxxxxxxxxxxxxxxxxxx>
Dana L. How <danahow@xxxxxxxxx> Dana How
@@ -64,13 +67,15 @@ Derrick Stolee <dstolee@xxxxxxxxxxxxx> Derrick Stolee via GitGitGadget <gitgitga
Deskin Miller <deskinm@xxxxxxxxx>
Đoàn Trần Công Danh <congdanhqx@xxxxxxxxx> Doan Tran Cong Danh
Dirk Süsserott <newsletter@xxxxxxxxxxx>
+Ed Maste <emaste@xxxxxxxxxxx> <emaste@xxxxxxxxxxx>
Eric Blake <eblake@xxxxxxxxxx> <ebb9@xxxxxxx>
Eric Hanchrow <eric.hanchrow@xxxxxxxxx> <offby1@xxxxxxxxx>
Eric S. Raymond <esr@xxxxxxxxxxx>
Eric Wong <e@xxxxxxxxx> <normalperson@xxxxxxxx>
Erik Faye-Lund <kusmabite@xxxxxxxxx> <kusmabite@xxxxxxxxxxxxxx>
Eyvind Bernhardsen <eyvind.bernhardsen@xxxxxxxxx> <eyvind-git@xxxxxxxxxxxxxx>
-Fangyi Zhou <fangyi.zhou@xxxxxxxxxx> Zhou Fangyi
+Fangyi Zhou <me@xxxxxxxxx> <fangyi.zhou@xxxxxxxxxx>
+Fangyi Zhou <me@xxxxxxxxx> Zhou Fangyi <fangyi.zhou@xxxxxxxxxx>
Florian Achleitner <florian.achleitner.2.6.31@xxxxxxxxx> <florian.achleitner2.6.31@xxxxxxxxx>
Franck Bui-Huu <vagabon.xyz@xxxxxxxxx> <fbuihuu@xxxxxxxxx>
Frank Lichtenheld <frank@xxxxxxxxxxxxxx> <djpig@xxxxxxxxxx>
@@ -107,6 +112,8 @@ Jeff Muizelaar <jmuizelaar@xxxxxxxxxxx> <jeff@xxxxxxxxxxxx>
Jens Axboe <axboe@xxxxxxxxx> <axboe@xxxxxxx>
Jens Axboe <axboe@xxxxxxxxx> <jens.axboe@xxxxxxxxxx>
Jens Lindström <jl@xxxxxxxxx> Jens Lindstrom <jl@xxxxxxxxx>
+Jiang Xin <worldhello.net@xxxxxxxxx> <xin.jiang@xxxxxxxxxx>
+Jiang Xin <worldhello.net@xxxxxxxxx> <zhiyou.jx@xxxxxxxxxxxxxxx>
Jim Meyering <jim@xxxxxxxxxxxx> <meyering@xxxxxxxxxx>
Joachim Berdal Haga <cjhaga@xxxxxxxxxx>
Joachim Jablon <joachim.jablon@xxxxxxxxxxxxxx> <ewjoachim@xxxxxxxxx>
@@ -142,6 +149,7 @@ Kazuki Saitoh <ksaitoh560@xxxxxxxxx> kazuki saitoh <ksaitoh560@xxxxxxxxx>
Keith Cascio <keith@xxxxxxxxxxx> <keith@xxxxxxxxxxx>
Kent Engstrom <kent@xxxxxxxxxxxxxx>
Kevin Leung <kevinlsk@xxxxxxxxx>
+Kevin Willford <Kevin.Willford@xxxxxxxxxxxxx> <kewillf@xxxxxxxxxxxxx>
Kirill Smelkov <kirr@xxxxxxxxxxxxxx> <kirr@xxxxxxxxxxxxxxxxxxx>
Kirill Smelkov <kirr@xxxxxxxxxxxxxx> <kirr@xxxxxxxxxx>
Knut Franke <Knut.Franke@xxxxxx> <k.franke@xxxxxxxxxxxxxxxxxxxx>
@@ -209,6 +217,7 @@ Paul Mackerras <paulus@xxxxxxxxx> <paulus@dorrigo.(none)>
Paul Mackerras <paulus@xxxxxxxxx> <paulus@pogo.(none)>
Peter Baumann <waste.manager@xxxxxx> <Peter.B.Baumann@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
Peter Baumann <waste.manager@xxxxxx> <siprbaum@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
+Peter Kaestle <peter@xxxxxxxx> <peter.kaestle@xxxxxxxxx>
Peter Krefting <peter@xxxxxxxxxxxxxxxx> <peter@xxxxxxxxxxxxxxxx>
Peter Krefting <peter@xxxxxxxxxxxxxxxx> <peter@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
Petr Baudis <pasky@xxxxxx> <pasky@xxxxxxx>
@@ -256,6 +265,7 @@ Steven Grimm <koreth@xxxxxxxxxxxxx> <sgrimm@sgrimm-mbp.local>
Steven Grimm <koreth@xxxxxxxxxxxxx> koreth@xxxxxxxxxxxxx
Steven Walter <stevenrwalter@xxxxxxxxx> <swalter@xxxxxxxxxxx>
Steven Walter <stevenrwalter@xxxxxxxxx> <swalter@xxxxxxxxxxxxxxxxxxxxxxxx>
+Sun Chao <sunchao9@xxxxxxxxxx> <16657101987@xxxxxxx>
Sven Verdoolaege <skimo@xxxxxxxxxx> <Sven.Verdoolaege@xxxxxxxxxxxxxxxxx>
Sven Verdoolaege <skimo@xxxxxxxxxx> <skimo@xxxxxxxx>
SZEDER Gábor <szeder.dev@xxxxxxxxx> <szeder@xxxxxxxxxx>
--
2.28.0.277.g9b3c35fffd
