[PATCH] create .mailmap file (for git shortlog/blame)

diff --git a/84/74d473433086947e77f82cf854bfc2c03f7e61 b/84/74d473433086947e77f82cf854bfc2c03f7e61
new file mode 100644 (file)
index 0000000..93f669d
--- /dev/null
+++ b/84/74d473433086947e77f82cf854bfc2c03f7e61
@@ -0,0 +1,71 @@
+Return-Path: <bremner@tethera.net>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by arlo.cworth.org (Postfix) with ESMTP id 30B926DE00CC\r
+ for <notmuch@notmuchmail.org>; Fri, 22 Jul 2016 05:48:03 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.011\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.011 tagged_above=-999 required=5 tests=[AWL=0.000,\r
+  SPF_PASS=-0.001, T_RP_MATCHES_RCVD=-0.01] autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id TYOsqpfjV1u2 for <notmuch@notmuchmail.org>;\r
+ Fri, 22 Jul 2016 05:47:54 -0700 (PDT)\r
+Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197])\r
+ by arlo.cworth.org (Postfix) with ESMTPS id A3E946DE00BF\r
+ for <notmuch@notmuchmail.org>; Fri, 22 Jul 2016 05:47:54 -0700 (PDT)\r
+Received: from remotemail by fethera.tethera.net with local (Exim 4.84_2)\r
+ (envelope-from <bremner@tethera.net>)\r
+ id 1bQZsD-0004tg-CA; Fri, 22 Jul 2016 08:48:13 -0400\r
+Received: (nullmailer pid 5964 invoked by uid 1000);\r
+ Fri, 22 Jul 2016 12:47:50 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] create .mailmap file (for git shortlog/blame)\r
+Date: Fri, 22 Jul 2016 09:47:34 -0300\r
+Message-Id: <1469191654-5922-1-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 2.8.1\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.20\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <https://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch/>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <https://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Fri, 22 Jul 2016 12:48:03 -0000\r
+\r
+Recently it was suggested on the list that we add a contributor to\r
+AUTHORS. This file has been unmodified for 7 years, and is somewhat out\r
+of date. It would potentially make sense to automagically update this\r
+file during the release process using the output from git shortlog. This\r
+file helps clean up some inconsistencies in author data in the history.\r
+---\r
+ .mailmap | 8 ++++++++\r
+ 1 file changed, 8 insertions(+)\r
+ create mode 100644 .mailmap\r
+\r
+diff --git a/.mailmap b/.mailmap\r
+new file mode 100644\r
+index 0000000..935c6eb\r
+--- /dev/null\r
++++ b/.mailmap\r
+@@ -0,0 +1,8 @@\r
++Peter Feigl <craven@gmx.net>\r
++Nate <nstraz@redhat.com>\r
++Ali Polatel <alip@penguen.ev>\r
++Stefan <aeuii@posteo.de>\r
++Patrick Totzke <patricktotzke@googlemail.com>\r
++Patrick Totzke <patricktotzke@gmail.com>\r
++Patrick Totzke <p.totzke@ed.ac.uk>\r
++Mark Walters <markwalters1009@gmail.com>\r
+-- \r
+2.8.1\r
+\r