From patchwork Thu Nov 17 13:41:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Russell Bryant X-Patchwork-Id: 696113 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tKMjz63Mmz9t0v for ; Fri, 18 Nov 2016 00:41:59 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 88CA9B8B; Thu, 17 Nov 2016 13:41:36 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 2BBEDB7B for ; Thu, 17 Nov 2016 13:41:35 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 04BEF22C for ; Thu, 17 Nov 2016 13:41:33 +0000 (UTC) Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8442DC00F09D; Thu, 17 Nov 2016 13:41:33 +0000 (UTC) Received: from t460s.redhat.com (ovpn-112-57.phx2.redhat.com [10.3.112.57]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id uAHDfV5a032337; Thu, 17 Nov 2016 08:41:32 -0500 From: Russell Bryant To: dev@openvswitch.org Date: Thu, 17 Nov 2016 08:41:30 -0500 Message-Id: <20161117134130.22165-1-russell@ovn.org> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Thu, 17 Nov 2016 13:41:33 +0000 (UTC) X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH] .mailmap: Document file format. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org Note that official file format documentation is in git-shortlog(1), but provide a simple quick reference for the two types of entries currently used in this file. A third type of entry was used previously, but this commit simplifies them into one of the two forms documented. Signed-off-by: Russell Bryant Acked-by: Simon Horman --- .mailmap | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/.mailmap b/.mailmap index a5eea0c..f01664e 100644 --- a/.mailmap +++ b/.mailmap @@ -1,13 +1,24 @@ +# See git-shortlog(1) for official documentation of this file format. +# +# Name +# Use "Name" for any commit with address "". This is useful when a person +# has commits using different spellings of their name, but with the same email +# address. +# +# Name +# Use "Name" and "" for any commit with the address "". This is useful +# when a person has used more than one email address. + Aaron Conole Aaron Conole Aaron Rosen Alex Wang Alexey I. Froloff +Alin Serdean Alin Serdean -Alin Serdean Alin Gabriel Sardean +Andy Zhou Andy Zhou Andy Zhou -Andy Zhou andy zhou Ansis Atteka Ansis Atteka Anupam Chanda @@ -25,8 +36,8 @@ Fischetti, Antonio Flavio Fernandes Flavio Leitner Gal Sagie +Gurucharan Shetty Gurucharan Shetty -Gurucharan Shetty Guru Shetty Henry Mai Hui Kang Ian Campbell @@ -51,7 +62,7 @@ Raju Subramanian Ralf Spenneberg Rami Rosen Ramu Ramamurthy -Robert Åkerblom-Andersson Robert Åkerblom-Andersson +Robert Åkerblom-Andersson Romain Lenglet Romain Lenglet Russell Bryant