From 3df6ca74f3848a745addcf7e94c175e02bbcb0dd Mon Sep 17 00:00:00 2001
From: Aaron Meurer <asmeurer@gmail.com>
Date: Mon, 11 Mar 2013 19:14:57 -0600
Subject: [PATCH] Add .mailmap

Now git shortlog -ns has no duplicates. Also, I wanted an excuse to exercise
my push access :)
---
 .mailmap | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 .mailmap

diff --git a/.mailmap b/.mailmap
new file mode 100644
index 00000000..d1cebcb8
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,12 @@
+# Prevent git from showing duplicate names with commands like "git shortlog"
+# See the manpage of git-shortlog for details.
+# The syntax is:
+# Name that should be used <email that should be used> Bad name <bad email>
+#
+# You can skip Bad name if it is the same as the one that should be used, and
+# is unique.
+#
+# This file is up-to-date if the command git log --format="%aN <%aE>" | sort
+# -u
+# gives no duplicates.
+Andreas Klöckner <inform@tiker.net> Andreas Kloeckner <inform@tiker.net