From 729c856c812e435787e3f06f5ac84279b3833ffd Mon Sep 17 00:00:00 2001
From: Sam Pablo Kuper <sampablokuper@uclmail.net>
Date: Mon, 19 Jun 2017 17:55:56 +0100
Subject: [PATCH] Add mailmap (via subtree) to aid git shortlog

Add from https://github.com/contentmine/mailmap using the manual
git subtree method.

If you are unfamiliar with the latter, see:
https://medium.com/@porteneuve/mastering-git-subtrees-943d29a798ec
or see this archived version of that tutorial:
https://web.archive.org/web/20170614142753/https://medium.com/@porteneuve/mastering-git-subtrees-943d29a798ec
---
 .mailmap          |  1 +
 mailmap/.mailmap  | 35 +++++++++++++++++++++++++++++++++++
 mailmap/README.md |  1 +
 3 files changed, 37 insertions(+)
 create mode 120000 .mailmap
 create mode 100644 mailmap/.mailmap
 create mode 100644 mailmap/README.md

diff --git a/.mailmap b/.mailmap
new file mode 120000
index 0000000..144f7be
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1 @@
+mailmap/.mailmap
\ No newline at end of file
diff --git a/mailmap/.mailmap b/mailmap/.mailmap
new file mode 100644
index 0000000..a5f9109
--- /dev/null
+++ b/mailmap/.mailmap
@@ -0,0 +1,35 @@
+Andy Howlett <andyhowlett@googlemail.com> AndyHowlett <andyhowlett@googlemail.com>
+Andy Howlett <andyhowlett@googlemail.com> AndyHowlett <none@none>
+Chris Hartgerink <chartgerink@users.noreply.github.com>
+Chris Hartgerink <chjh@protonmail.com> C.H.J. Hartgerink <u1233095@campus.uvt.nl>
+Chris Hartgerink <chjh@protonmail.com> CHJ Hartgerink <chjh@protonmail.com>
+Chris Hartgerink <chjh@protonmail.com> Chris Hartgerink <chartgerink@users.noreply.github.com>
+Chris Hartgerink <chjh@protonmail.com> chjh <chjh@localhost.localdomain>
+Christopher Kittel <web@christopherkittel.eu> <c.kittel@online.de>
+Christopher Kittel <web@christopherkittel.eu> Christopher KIttel <web@christopherkittel.eu>
+Christopher Kittel <web@christopherkittel.eu> chreman <web@christopherkittel.eu>
+Jim Downing <none@none> jimdowning <none@none>
+Mark Williamson <mw529@cam.ac.uk> Mark Williamson <mjw@mjw.name>
+Mark Williamson <mw529@cam.ac.uk> mjw@mjw.name <mjw@mjw.name>
+Murray Jensen <Murray.Jensen@csiro.au> mjjensen <none@none>
+Nick England <nickengland@gmail.com> nickengland <none@none>
+Nick England <nickengland@gmail.com> nwe23 <none@none>
+Peter Murray-Rust <peter.murray.rust@googlemail.com> Peter Murray-Rust <pm286@cam.ac.uk>
+Peter Murray-Rust <peter.murray.rust@googlemail.com> petemer <none@none>
+Peter Murray-Rust <peter.murray.rust@googlemail.com> peter <none@none>
+Peter Murray-Rust <peter.murray.rust@googlemail.com> peter <petermr@users.noreply.github.com>
+Peter Murray-Rust <peter.murray.rust@googlemail.com> peter,r <none@none>
+Peter Murray-Rust <peter.murray.rust@googlemail.com> peterm <none@none>
+Peter Murray-Rust <peter.murray.rust@googlemail.com> peterme <none@none>
+Peter Murray-Rust <peter.murray.rust@googlemail.com> petermmr <petermr@users.noreply.github.com>
+Peter Murray-Rust <peter.murray.rust@googlemail.com> petermr <none@none>
+Peter Murray-Rust <peter.murray.rust@googlemail.com> petermr <peter.murray.rust@googlemail.com>
+Peter Murray-Rust <peter.murray.rust@googlemail.com> petermr <petermr@users.noreply.github.com>
+Peter Murray-Rust <peter.murray.rust@googlemail.com> petrmr <none@none>
+Peter Murray-Rust <peter.murray.rust@googlemail.com> pm286 <none@none>
+Richard Smith-Unna <richardsmith404@gmail.com> Richard Smith-Unna <rds45@cam.ac.uk>
+Sam E. Adams <sea36@cam.ac.uk> sea36 <none@none>
+Thomas Arrow <thomasarrow@gmail.com> Thomas Arrow <tom@contentmine.org>
+Thomas Arrow <thomasarrow@gmail.com> Tom Arrow <bomarrow1@gmail.com>
+Thomas Arrow <thomasarrow@gmail.com> tarrow <tarrow@users.noreply.github.com>
+Weerapong Phadungsukanan <wp214@cam.ac.uk> wp214 <none@none>
diff --git a/mailmap/README.md b/mailmap/README.md
new file mode 100644
index 0000000..7fc6813
--- /dev/null
+++ b/mailmap/README.md
@@ -0,0 +1 @@
+# mailmap