From: Fangyi Zhou Date: Fri, 10 Sep 2021 13:02:36 GMT Subject: [PATCH] .mailmap: Update mailmap Message-ID: <20210910130236.40101-1-me@fangyi.io> 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 , 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 --- 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 Ben Walton Benoit Sigoure Bernt Hansen +Birger Skogeng Pedersen Brandon Casey Brandon Williams +Brandon Williams brian m. carlson brian m. carlson brian m. carlson Bryan Larsen Bryan Larsen +CB Bailey Charles Bailey Cheng Renquan Chris Shoemaker Chris Wright @@ -41,10 +44,12 @@ Christian Ludwig Cord Seele Christian Couder Christian Stimming -Christopher Díaz Riveros Christopher Diaz Riveros +Christopher Díaz Riveros +Christopher Díaz Riveros Christopher Diaz Riveros Clemens Buchacher Clemens Buchacher Csaba Henk +Damien Robert Dan Johnson Dana L. How Dana L. How Dana How @@ -64,13 +69,15 @@ Derrick Stolee Derrick Stolee via GitGitGadget Đoàn Trần Công Danh Doan Tran Cong Danh Dirk Süsserott +Ed Maste Eric Blake Eric Hanchrow Eric S. Raymond Eric Wong Erik Faye-Lund Eyvind Bernhardsen -Fangyi Zhou Zhou Fangyi +Fangyi Zhou +Fangyi Zhou Zhou Fangyi Florian Achleitner Franck Bui-Huu Frank Lichtenheld @@ -102,11 +109,14 @@ Jason Riedy Jay Soffian Jean-Noël Avila Jean-Noel Avila Jean-Noël Avila Jean-Noël AVILA +Jean-Noël Avila Jean-Noel Avila Jeff King Jeff Muizelaar Jens Axboe Jens Axboe Jens Lindström Jens Lindstrom +Jessica Clarke James Clarke +Jiang Xin Jim Meyering Joachim Berdal Haga Joachim Jablon @@ -138,10 +148,12 @@ Karsten Blees Karsten Blees Kay Sievers Kay Sievers +Kazuhiro Kato Kazuki Saitoh kazuki saitoh Keith Cascio Kent Engstrom Kevin Leung +Kevin Willford Kirill Smelkov Kirill Smelkov Knut Franke @@ -211,6 +223,7 @@ Peter Baumann Peter Krefting Peter Krefting +Peter Kaestle Petr Baudis Petr Baudis Phil Hord @@ -242,9 +255,11 @@ Sebastian Schuberth Seth Falcon Shawn O. Pearce Wei Shuyu Shuyu Wei +Sibi Siddharthan Sidhant Sharma Sidhant Sharma [:tk] Simon Hausmann Simon Hausmann +Slavica Đukić Slavica Djukic Stefan Beller Stefan Beller Stefan Naewe @@ -296,3 +311,7 @@ Yi-Jyun Pan anonymous anonymous İsmail Dönmez + +# Do not merge +# Andreas Schwab +# Andreas Schwab -- 2.32.0