From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-Status: No, score=-4.1 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_PASS, SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id A90171F990 for ; Wed, 5 Aug 2020 06:56:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726932AbgHEGzN (ORCPT ); Wed, 5 Aug 2020 02:55:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39616 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725920AbgHEGzM (ORCPT ); Wed, 5 Aug 2020 02:55:12 -0400 Received: from mail-lf1-x142.google.com (mail-lf1-x142.google.com [IPv6:2a00:1450:4864:20::142]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F14BFC06174A for ; Tue, 4 Aug 2020 23:55:11 -0700 (PDT) Received: by mail-lf1-x142.google.com with SMTP id x24so6366985lfe.11 for ; Tue, 04 Aug 2020 23:55:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rmK4zZz4lW04wdBqgo6/xFkvhqjCLz6s5KrKnFG+MkY=; b=AEBMDN37jSDdjUgC7luxW371wQJu1SvRg2K+YzOzg9xe4nZh2cKVzcv8+aIRrKR4af /1XMdHYzMqYHay3uDl2ZCqT69vJ4AIBiXps/vJJc0Eb5IDfYvAb9BrT0ltOCZJmZIxt3 bFDxHFJhRHkUD4yDObC58y46wAh+QjImEx+PyMa41QDjdkEuWvhlZd6seMAU5+NlDpSn tf1N6/umCeKuasbbrPixe7td+g/4ONPP9gfnDwuedJ8th3V3JR2IS03jpmUP1XJTJIP9 TqlYyP42EuggJuwW5A5k0Fp/cEfpMp0Gx1hPiuVNogSCya1+mtUBIugHfbD7JeFL3shv 7geA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rmK4zZz4lW04wdBqgo6/xFkvhqjCLz6s5KrKnFG+MkY=; b=adDG4VaLDkF3uiQgzltaHo/XXr2xAOMwn0iDQUluRF0KBtsM81vmidSkmyT9iNtI0T R4dP+R44IW1CB1M4YyWV4ZfRjYLz5JBYR34bceGwuD7t1cUtlQfdJRVomxft0cVigU59 FMFR+jb0BiLk8oCOpmS6PffGUTfpwQBYIQ1n6aInBp6LVQVIl3E8muk/hnh9lp7/G/ys OAK+eDAvwpeBjoH63vpdLfRqrYqUdU8G8rNkO9FaExUovgfIFpl4FM/B0bE5Uhx40NMA M6t+5wAQ7564vbNWNB7/t/PBmCZ71zu2YEIY2NFLF5sXwp9IRulI1tnPFG5IXecN2fcl mY1g== X-Gm-Message-State: AOAM533D/cQxd1S7CYMq4Juo6huSJDTdR1pW58c7NJIicZr9d5YY+8xS mKNUtsHyD1iSCqZa29Z4jIXFgQ13ARw= X-Google-Smtp-Source: ABdhPJzwnfT8/1XOY7Cm18iwKgQkP52HR39xDFHieQA18n05vt8hhpncyJ17PzZZyd/30KLilW8bLw== X-Received: by 2002:a19:8704:: with SMTP id j4mr889703lfd.198.1596610510090; Tue, 04 Aug 2020 23:55:10 -0700 (PDT) Received: from localhost.localdomain (92-33-153-30.customers.ownit.se. [92.33.153.30]) by smtp.gmail.com with ESMTPSA id d15sm476370ljl.32.2020.08.04.23.55.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Aug 2020 23:55:09 -0700 (PDT) From: =?UTF-8?q?Martin=20=C3=85gren?= To: git@vger.kernel.org Cc: Andreas Schwab , Andreas Schwab , Birger Skogeng Pedersen , Birger Skogeng Pedersen , Brandon Williams , Brandon Williams , Damien Robert , Damien Robert , Ed Maste , Ed Maste , Fangyi Zhou , Fangyi Zhou , Jiang Xin , Jiang Xin , Jiang Xin , Kevin Willford , Kevin Willford , Peter Kaestle , Peter Kaestle , Sun Chao , Sun Chao <16657101987@163.com>, Junio C Hamano , Jeff King Subject: [PATCH RESEND] Update .mailmap Date: Wed, 5 Aug 2020 08:54:08 +0200 Message-Id: <20200805065408.1242617-1-martin.agren@gmail.com> X-Mailer: git-send-email 2.28.0.236.gb10cc79966 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org 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 --- 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 Alexey Shumkin Anders Kaseorg Anders Kaseorg +Andreas Schwab Andrey Mazo Mazo, Andrey Aneesh Kumar K.V Amos Waterland @@ -27,8 +28,10 @@ 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 @@ -45,6 +48,7 @@ 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 +68,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 @@ -107,6 +113,8 @@ Jeff Muizelaar Jens Axboe Jens Axboe Jens Lindström Jens Lindstrom +Jiang Xin +Jiang Xin Jim Meyering Joachim Berdal Haga Joachim Jablon @@ -142,6 +150,7 @@ Kazuki Saitoh kazuki saitoh Keith Cascio Kent Engstrom Kevin Leung +Kevin Willford Kirill Smelkov Kirill Smelkov Knut Franke @@ -213,6 +222,7 @@ Peter Krefting Peter Krefting Petr Baudis Petr Baudis +Peter Kaestle Phil Hord Philip Jägenstedt Philip Oakley # secondary @@ -256,6 +266,7 @@ Steven Grimm Steven Grimm koreth@midwinter.com Steven Walter Steven Walter +Sun Chao <16657101987@163.com> Sven Verdoolaege Sven Verdoolaege SZEDER Gábor -- 2.28.0.236.gb10cc79966