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@xxxxxxxxx>, taking into consideration of <xmqqsgcm4ij5.fsf@xxxxxxxxxxxxxxxxxxxxxx>, 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@xxxxxxxxx> --- 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@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 <bwilliamseng@xxxxxxxxx> <bmwill@xxxxxxxxxx> brian m. carlson <sandals@xxxxxxxxxxxxxxxxxxxx> brian m. carlson <sandals@xxxxxxxxxxxxxxxxxxxx> <sandals@xxxxxxxxxxxxxxxxxxxxxxx> brian m. carlson <sandals@xxxxxxxxxxxxxxxxxxxx> <bk2204@xxxxxxxxxx> Bryan Larsen <bryan@xxxxxxxxx> <bryan.larsen@xxxxxxxxx> Bryan Larsen <bryan@xxxxxxxxx> <bryanlarsen@xxxxxxxxx> +CB Bailey <cbailey32@xxxxxxxxxxxxx> Charles Bailey Cheng Renquan <crquan@xxxxxxxxx> Chris Shoemaker <c.shoemaker@xxxxxxx> Chris Wright <chrisw@xxxxxxxxxxxx> <chrisw@xxxxxxxx> @@ -41,10 +44,12 @@ Christian Ludwig <chrissicool@xxxxxxxxx> <chrissicool@xxxxxxxxxxxxxx> Cord Seele <cowose@xxxxxxxxx> <cowose@xxxxxxxxxxxxxx> Christian Couder <chriscool@xxxxxxxxxxxxx> <christian.couder@xxxxxxxxx> Christian Stimming <stimming@xxxxxxx> <chs@ckiste.goetheallee> -Christopher Díaz Riveros <chrisadr@xxxxxxxxxx> Christopher Diaz Riveros +Christopher Díaz Riveros <christopher.diaz.riv@xxxxxxxxx> <chrisadr@xxxxxxxxxx> +Christopher Díaz Riveros <christopher.diaz.riv@xxxxxxxxx> 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 +69,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> @@ -102,11 +109,14 @@ Jason Riedy <ejr@xxxxxxxxxxxxxxxxx> <ejr@xxxxxxxxxxxxxxx> Jay Soffian <jaysoffian@xxxxxxxxx> <jaysoffian+git@xxxxxxxxx> Jean-Noël Avila <jn.avila@xxxxxxx> Jean-Noel Avila Jean-Noël Avila <jn.avila@xxxxxxx> Jean-Noël AVILA +Jean-Noël Avila <jn.avila@xxxxxxx> Jean-Noel Avila <jean-noel.avila@xxxxxxxxxxx> Jeff King <peff@xxxxxxxx> <peff@xxxxxxxxxx> 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> +Jessica Clarke <jrtc27@xxxxxxxxxx> James Clarke +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> @@ -138,10 +148,12 @@ Karsten Blees <blees@xxxxxxx> <karsten.blees@xxxxxxx> Karsten Blees <blees@xxxxxxx> <karsten.blees@xxxxxxxxx> Kay Sievers <kay.sievers@xxxxxxxx> <kay.sievers@xxxxxxx> Kay Sievers <kay.sievers@xxxxxxxx> <kay@mam.(none)> +Kazuhiro Kato <kato-k@xxxxxxxxxxxxx> <kazuhiro.kato@xxxxxxxxxxxxx> 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> @@ -211,6 +223,7 @@ Peter Baumann <waste.manager@xxxxxx> <Peter.B.Baumann@xxxxxxxxxxxxxxxxxxx-erlang Peter Baumann <waste.manager@xxxxxx> <siprbaum@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx> Peter Krefting <peter@xxxxxxxxxxxxxxxx> <peter@xxxxxxxxxxxxxxxx> Peter Krefting <peter@xxxxxxxxxxxxxxxx> <peter@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx> +Peter Kaestle <peter@xxxxxxxx> <peter.kaestle@xxxxxxxxx> Petr Baudis <pasky@xxxxxx> <pasky@xxxxxxx> Petr Baudis <pasky@xxxxxx> <xpasky@machine> Phil Hord <hordp@xxxxxxxxx> <phil.hord@xxxxxxxxx> @@ -242,9 +255,11 @@ Sebastian Schuberth <sschuberth@xxxxxxxxx> <sschuberth@xxxxxxxxxxxxxxxxx> Seth Falcon <seth@xxxxxxxxxxxxxxx> <sfalcon@xxxxxxxxx> Shawn O. Pearce <spearce@xxxxxxxxxxx> Wei Shuyu <wsy@xxxxxxxxxx> Shuyu Wei +Sibi Siddharthan <sibisiddharthan.github@xxxxxxxxx> <sibisiv.siddharthan@xxxxxxxxx> Sidhant Sharma <tigerkid001@xxxxxxxxx> Sidhant Sharma [:tk] Simon Hausmann <hausmann@xxxxxxx> <simon@xxxxxx> Simon Hausmann <hausmann@xxxxxxx> <shausman@xxxxxxxxxxxxx> +Slavica Đukić <slawica92@xxxxxxxxxxx> Slavica Djukic <slavicadj.ip2018@xxxxxxxxx> Stefan Beller <stefanbeller@xxxxxxxxx> <stefanbeller@xxxxxxxxxxxxxx> Stefan Beller <stefanbeller@xxxxxxxxx> <sbeller@xxxxxxxxxx> Stefan Naewe <stefan.naewe@xxxxxxxxx> <stefan.naewe@xxxxxxxxxxxxxxxxxxxx> @@ -296,3 +311,7 @@ Yi-Jyun Pan <pan93412@xxxxxxxxx> anonymous <linux@xxxxxxxxxxx> anonymous <linux@xxxxxxxxxxx> İsmail Dönmez <ismail@xxxxxxxxxxxxx> + +# Do not merge +# Andreas Schwab <schwab@xxxxxxxxxxxxxx> +# Andreas Schwab <schwab@xxxxxxx> -- 2.32.0
