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 3154A1F453 for ; Thu, 8 Nov 2018 17:08:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727029AbeKICog (ORCPT ); Thu, 8 Nov 2018 21:44:36 -0500 Received: from mail-pg1-f196.google.com ([209.85.215.196]:42044 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726811AbeKICog (ORCPT ); Thu, 8 Nov 2018 21:44:36 -0500 Received: by mail-pg1-f196.google.com with SMTP id i4-v6so9112039pgq.9 for ; Thu, 08 Nov 2018 09:08:11 -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=9gbWDnTTrA24KNK6J0LNuc4KD3EA27LpgGRVTsdyiwY=; b=KkCx6O8yPCD7CH20hRKHWc6x9KwRiWGtRfF4eqmjC8d5YnQLXsZ8ZTB2RSkT+L7onr toUasxuIVGvKrxDL9fi6nHCUF5ironINbhQe2jVrjlSCehjE9rKCJ38WKOXxF/pXANV7 THbII/c4wsiJHYeV9M7I1RXmTA9UTmg5oz6yLg7LZBzhmIvsFzKgDpeKzleeS1MYWh6H fJtG94W3QNORpjZBYx5Rf44jbfjM6yO5lej6DOSotQjkiR7ql+wBNXZLpAnvASkORP+r Kd08IKz56B2VteifB39TGgPleYflkDi/C+x7Xa3ev8zqWDH9fIprRmyd0uzbC+hp/MXS m03g== 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=9gbWDnTTrA24KNK6J0LNuc4KD3EA27LpgGRVTsdyiwY=; b=s3unOEZnFG7rjh7hlOiPWgOHucgxL8UNYsfFOHfkWDjOtYf02ZdcDUCDWAiJYpz5MT owbNQXZIw11sxf6/sYLNxgkS0qnvsW34IOav38mM0yUxUkRtNYtBg5Uw5WjclsenjvLV R+T4cAXa5T15ckARLMcty+kFWE5poY9DzvcxNDU0EurokobhO9qOM93dJEtpMyX3FDEB VANKn9rg10oYOCeDvof+SDOtYGwPE2s6luChxDzILNP6OVXursa7bQie8sC77N7wHyU3 AvwTZUwMeojq028buRjReoK/eHPQzRNl0VL4bHqQMFahKMLrYmoPkuZXJi0UFHWRAMB8 9OJA== X-Gm-Message-State: AGRZ1gIeWs2lj7SoSUDdVpeZAS8jc/7Mam0nI4xOxW9g0rwfkjVaWhvS oXz0AznXHsVYwsvMASO3mc3lSBTg X-Google-Smtp-Source: AJdET5c0luGFjjUXDdkXVsCkvW1xTCxNilc5XRNKKpO+EvVi1lnWI8ORA8nk1aMCA3vsAY8gffWWqg== X-Received: by 2002:a62:25c2:: with SMTP id l185-v6mr5522529pfl.64.1541696890528; Thu, 08 Nov 2018 09:08:10 -0800 (PST) Received: from [127.0.0.1] ([40.112.139.188]) by smtp.gmail.com with ESMTPSA id a73-v6sm4661711pfj.38.2018.11.08.09.08.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Nov 2018 09:08:09 -0800 (PST) Date: Thu, 08 Nov 2018 09:08:09 -0800 (PST) X-Google-Original-Date: Thu, 08 Nov 2018 17:08:06 GMT Message-Id: In-Reply-To: References: From: "Johannes Schindelin via GitGitGadget" Subject: [PATCH 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` duplicate-free. Signed-off-by: Johannes Schindelin --- .mailmap | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.mailmap b/.mailmap index bef3352b0d..1d8310073a 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