From 4ee0aa06f7108395ea62df10c3fbf2117c44d891 Mon Sep 17 00:00:00 2001
From: Stefan Beller <stefanbeller@googlemail.com>
Date: Mon, 22 Apr 2013 21:04:05 +0200
Subject: [PATCH] Add the .mailmap file

The .mailmap feature is used to coalesce together commits by the same
person in the shortlog, where their name and/or email address was
spelled differently.

For further reference see the man page of git shortlog

git shortlog -sne |awk '{ print $NF }' |sort |uniq -d

git shortlog -sne |awk '{ NF--; $1=""; print }' |sort |uniq -d
---
 .mailmap | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 .mailmap

diff --git a/.mailmap b/.mailmap
new file mode 100644
index 000000000..d0a8fb95a
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,3 @@
+Miguel Ángel Arruga Vivas <rosen644835@gmail.com> Miguel Angel Arruga Vivas <rosen644835@gmail.com>
+Daiki Ueno <ueno@gnu.org> Daiki Ueno <ueno@unixuser.org>
+Guido Flohr <guido@imperia.net> Guido Flohr <guido@imperia.bg>
-- 
2.47.2