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 EDEAA1F990 for ; Tue, 4 Aug 2020 21:08:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726568AbgHDVIO (ORCPT ); Tue, 4 Aug 2020 17:08:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34128 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726101AbgHDVIO (ORCPT ); Tue, 4 Aug 2020 17:08:14 -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 A19E5C06174A for ; Tue, 4 Aug 2020 14:08:13 -0700 (PDT) Received: by mail-lf1-x142.google.com with SMTP id b11so23135369lfe.10 for ; Tue, 04 Aug 2020 14:08:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=NxEcV8jmoVbILN5FPHhnj43KQN7di6FNkFxcJF5OFU4=; b=EsL+LbZw2yPAMA+UCP3MeXE4Mk13trVli3Xc5ocmeUsmKWikXx6a8UHT+RlHx5GOCV I4HF5v1z4LeE0BtvomayKuNzYgLSdBiC962CFoQQKMtQq5264AOHrcQKID6Bpvwys/IU cjgVcKh7fLKQkygFidceWvAFNKRZhSXcJX617pW1rgSHtbJfhu+R4T4VvGFyJud8wOez 13FheBVIC14FFVlXVAuKNa5Pdgadg5Os8GgGA14W9UtKsCa+8l+PNbVNR1YIHFJA9tPE tb3hOUZfBrU6c3m3NzGcYnydnUwJoq5HwmjMRR5BgCfC7v4JhT/aB2oNsSQ9yIGijazn hoTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=NxEcV8jmoVbILN5FPHhnj43KQN7di6FNkFxcJF5OFU4=; b=PpWwRbt+FFjkEjZodsrdUu2f+rJ5Yt3a3+Z452p3G0mTrtN8Wjhbdlsv+0WUKzrFpm RREzrXH4AZEBe5UWoSAocyQsA3H0nxqTBtYDz1PqZKt0AYveWVphOqwJidiPaQS5gZ4C O0GNRbNqT45kfJwc/gX1D0fDX4bzTmPunukhQof9f7zx3jBdoroKO+1UU29rinx+KTAO wcxLANIMUtyVjrJq1I+yy2Ay1Mp8stwAnu1BXxPiEQhLdYjdNdTxDt/Q0Ai++GhF0so2 be/Rdl1fGcFKgBJDRWi8gEpgQ8TO6Uv+iSAYnjH0/iScPGdaTDbWn8Qaw8jsggd8wHe2 2X5Q== X-Gm-Message-State: AOAM530BNcwm15vQzRwBIti7T0A40po5fM9rQKim8j5yoridvZiIE34+ 7uqZG4AU2au5fQJW5gRrUMS6uKWK X-Google-Smtp-Source: ABdhPJwOF+W/UCI4zwe+KBaunSASLpMRoQ8MYBbWUMmKN32LBCOLR3ZPzbW+3gLKGVLDNhdED61zRA== X-Received: by 2002:a19:230e:: with SMTP id j14mr38902lfj.19.1596575291765; Tue, 04 Aug 2020 14:08:11 -0700 (PDT) Received: from localhost.localdomain (92-33-153-30.customers.ownit.se. [92.33.153.30]) by smtp.gmail.com with ESMTPSA id t22sm70614lfr.12.2020.08.04.14.08.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Aug 2020 14:08:10 -0700 (PDT) From: =?UTF-8?q?Martin=20=C3=85gren?= To: git@vger.kernel.org Subject: [PATCH] Update .mailmap Date: Tue, 4 Aug 2020 23:07:58 +0200 Message-Id: <20200804210758.1241259-1-martin.agren@gmail.com> X-Mailer: git-send-email 2.28.0.236.gb10cc79966 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 --- .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