From: David Bremner <david@tethera.net>
Date: Fri, 22 Jul 2016 12:47:34 +0000 (-0300)
Subject: create .mailmap file (for git shortlog/blame)
X-Git-Tag: 0.23_rc0~71
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=2ce0f1368f3c69071c04019c6aa8b6dfcca2015b

create .mailmap file (for git shortlog/blame)

Recently it was suggested on the list that we add a contributor to
AUTHORS. This file has been unmodified for 7 years, and is somewhat out
of date. It would potentially make sense to automagically update this
file during the release process using the output from git shortlog. This
file helps clean up some inconsistencies in author data in the history.
---

diff --git a/.mailmap b/.mailmap
new file mode 100644
index 00000000..935c6eb0
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,8 @@
+Peter Feigl <craven@gmx.net>
+Nate <nstraz@redhat.com>
+Ali Polatel <alip@penguen.ev>
+Stefan <aeuii@posteo.de>
+Patrick Totzke <patricktotzke@googlemail.com>
+Patrick Totzke <patricktotzke@gmail.com>
+Patrick Totzke <p.totzke@ed.ac.uk>
+Mark Walters <markwalters1009@gmail.com>