From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.9 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,RCVD_IN_DNSWL_HI shortcircuit=no autolearn=ham autolearn_force=no version=3.4.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 1AE351F453 for ; Fri, 9 Nov 2018 11:31:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728238AbeKIVL3 (ORCPT ); Fri, 9 Nov 2018 16:11:29 -0500 Received: from mail-pg1-f193.google.com ([209.85.215.193]:39785 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727552AbeKIVL2 (ORCPT ); Fri, 9 Nov 2018 16:11:28 -0500 Received: by mail-pg1-f193.google.com with SMTP id r9-v6so743921pgv.6 for ; Fri, 09 Nov 2018 03:31:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:message-id:in-reply-to:references:from:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=VrEoJHALKzAECXhA53DJ5q1IeynEzNEwCYFU9RiHcgA=; b=JDGrEMFRI8GPSsk4dTEaU/6Pmr8pqnFLaKg/0pao08RUqxhS9++4JxfHxifL7Dh14U +ud3NHeaslllkzZn6jyqAjoIa3rxiGpe81qCUnQ9JGy8DmmCPqhbBi1fylXxR6Ncd4Ja 6uTXAtylnCVMWgnmmAqmmBNfYC9E7tDonqgoZtqKiQ0zFC6O5ytYwjl7v+qfHOnY6ges Dl2A8kdOJuembYWMtzoQHcw3hOW9pHzq6EF7qPRp9O03gphts4jaHd7TT72VA2ADzPUI vZ6k1XkumxwWlX1Ai3dJJaj47iIrbpqWUEXr29s2nsdEs33GOOIeVvj5/IfjspJ5ZlI/ xfhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:in-reply-to:references:from :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=VrEoJHALKzAECXhA53DJ5q1IeynEzNEwCYFU9RiHcgA=; b=GChgQGwwOiTIBSceB3IlwliZ8X763sY6oxIGp5WqGMnnIy6/Iu39wGGWyMPuYA0knB h/AyFvAOXEeG1KgBHcgBLOgZ8jUHDx8idIC5GilQEt2qwaIww2hmPAGuIjHPKilu+dLO XaBHwLTxubmT2TUHqFn/4KRUvy3p2D7sLGDqq77gsIor2DQL2+VsmnXCyuItcanN9Rxm jdaKz2qUFHza9pUYLHGUKCC3YTiEYTNYVoG/J9SBd6DuV4W+ZFqQLODUAbH/VxqZXzmf T45ldH7uTvTkzfqzk09E62gUA5fOaRT3BOqQonWqUU/PreRA6aZ6L5q85J4GdJOzqrwU +rgw== X-Gm-Message-State: AGRZ1gKWQCqLK1intWaNsjFf/yJOH+yjpIFMedUIYD4dEW2bFhkKadBu NBwoiZ6GsVh6tFfyR1h//gjhLVtBgsg= X-Google-Smtp-Source: AJdET5eYb4SIsf6BC1ds2IRl9nFHKLNgfUDt6sxhU2vBUHSCjO6l/+LTJDA8IffNaeQ+xywOXT1E1g== X-Received: by 2002:a63:8c0b:: with SMTP id m11-v6mr7126519pgd.422.1541763075147; Fri, 09 Nov 2018 03:31:15 -0800 (PST) Received: from [127.0.0.1] ([40.112.139.188]) by smtp.gmail.com with ESMTPSA id m5-v6sm10969298pfc.188.2018.11.09.03.31.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Nov 2018 03:31:14 -0800 (PST) Date: Fri, 09 Nov 2018 03:31:14 -0800 (PST) X-Google-Original-Date: Fri, 09 Nov 2018 11:31:11 GMT Message-Id: In-Reply-To: References: From: "Johannes Schindelin via GitGitGadget" Subject: [PATCH v2 1/1] Update .mailmap Fcc: Sent Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MIME-Version: 1.0 To: git@vger.kernel.org Cc: Junio C Hamano , Johannes Schindelin Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Johannes Schindelin This patch makes the output of `git shortlog -nse v2.10.0..master` duplicate-free. Signed-off-by: Johannes Schindelin --- .mailmap | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.mailmap b/.mailmap index bef3352b0d..eb7b5fc7b9 100644 --- a/.mailmap +++ b/.mailmap @@ -21,6 +21,8 @@ Anders Kaseorg Aneesh Kumar K.V Amos Waterland Amos Waterland +Ben Peart +Ben Peart Ben Walton Benoit Sigoure Bernt Hansen @@ -32,6 +34,7 @@ Bryan Larsen Cheng Renquan Chris Shoemaker Chris Wright +Christian Ludwig Cord Seele Christian Couder Christian Stimming @@ -51,6 +54,7 @@ David Reiss David S. Miller David Turner David Turner +Derrick Stolee Deskin Miller Dirk Süsserott Eric Blake @@ -98,6 +102,7 @@ Jens Axboe Jens Lindström Jens Lindstrom Jim Meyering Joachim Berdal Haga +Joachim Jablon Johannes Schindelin Johannes Sixt Johannes Sixt @@ -150,6 +155,7 @@ Mark Levedahl Mark Rada Martin Langhoff Martin von Zweigbergk +Masaya Suzuki Matt Draisey Matt Kraai Matt McCutchen @@ -157,6 +163,7 @@ Matthias Kestenholz Matthias Rüster Matthias Ruester Matthias Urlichs Matthias Urlichs +Matthieu Moy Michael Coleman Michael J Gruber Michael J Gruber @@ -180,7 +187,11 @@ Nick Stokoe Nick Woolley Nick Stokoe Nick Woolley Nicolas Morey-Chaisemartin Nicolas Morey-Chaisemartin +Nicolas Morey-Chaisemartin +Nicolas Morey-Chaisemartin +Nicolas Morey-Chaisemartin Nicolas Sebrecht +Orgad Shaneh Paolo Bonzini Pascal Obry Pascal Obry @@ -200,6 +211,7 @@ Philipp A. Hartmann Philippe Bruhat Ralf Thielow Ramsay Jones +Randall S. Becker René Scharfe René Scharfe Rene Scharfe Richard Hansen @@ -238,6 +250,7 @@ Steven Walter Sven Verdoolaege Sven Verdoolaege SZEDER Gábor +Tao Qingyun <845767657@qq.com> Tay Ray Chuan Ted Percival Theodore Ts'o -- gitgitgadget