From patchwork Thu Dec 1 18:55:24 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 5424 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id CA05323E0E for ; Thu, 1 Dec 2011 18:55:34 +0000 (UTC) Received: from mail-lpp01m010-f52.google.com (mail-lpp01m010-f52.google.com [209.85.215.52]) by fiordland.canonical.com (Postfix) with ESMTP id 9116CA1867B for ; Thu, 1 Dec 2011 18:55:34 +0000 (UTC) Received: by laah2 with SMTP id h2so1240705laa.11 for ; Thu, 01 Dec 2011 10:55:34 -0800 (PST) Received: by 10.152.135.225 with SMTP id pv1mr5538278lab.19.1322765734223; Thu, 01 Dec 2011 10:55:34 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.152.41.198 with SMTP id h6cs80828lal; Thu, 1 Dec 2011 10:55:34 -0800 (PST) Received: by 10.227.206.82 with SMTP id ft18mr3425204wbb.21.1322765732108; Thu, 01 Dec 2011 10:55:32 -0800 (PST) Received: from chiark.greenend.org.uk (chiark.greenend.org.uk. [212.13.197.229]) by mx.google.com with ESMTPS id e44si512539wed.4.2011.12.01.10.55.31 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 01 Dec 2011 10:55:32 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of pmaydell@chiark.greenend.org.uk designates 212.13.197.229 as permitted sender) client-ip=212.13.197.229; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pmaydell@chiark.greenend.org.uk designates 212.13.197.229 as permitted sender) smtp.mail=pmaydell@chiark.greenend.org.uk Received: by chiark.greenend.org.uk (Debian Exim 4.69 #1) with local (return-path pmaydell@chiark.greenend.org.uk) id 1RWBn2-0006Lk-JB; Thu, 01 Dec 2011 18:55:24 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Aurelien Jarno , Blue Swirl , Anthony Liguori , "Edgar E. Iglesias" , malc , Paul Brook , Andrzej Zaborowski Subject: [PATCH] Add a .mailmap to map pre-git-conversion authors to friendly names Date: Thu, 1 Dec 2011 18:55:24 +0000 Message-Id: <1322765724-24393-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.5.6.5 Sender: Peter Maydell Add a .mailmap file so 'git shortlog' can map the unfriendly pre-git-conversion author entries to real names. Signed-off-by: Peter Maydell --- v1->v2: fixed Andrzej's email to match MAINTAINERS file added entries for Fabrice Bellard, Jocelyn Mayer cc'd active maintainers with an entry in the mailmap .mailmap | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) create mode 100644 .mailmap diff --git a/.mailmap b/.mailmap new file mode 100644 index 0000000..80ea514 --- /dev/null +++ b/.mailmap @@ -0,0 +1,16 @@ +# This mailmap just translates the weird addresses from the original import into git +# into proper addresses so that they are counted properly in git shortlog output. +# +Aurelien Jarno aurel32 +Blue Swirl blueswir1 +Anthony Liguori aliguori +Edgar E. Iglesias edgar_igl +malc malc +Paul Brook pbrook +Andrzej Zaborowski balrog +Thiemo Seufer ths +Fabrice Bellard bellard +Jocelyn Mayer j_mayer +# There is also a: +# (no author) <(no author)@c046a42c-6fe2-441c-8c8c-71466251a162> +# for the cvs2svn initialization commit e63c3dc74bf.