summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap16
1 files changed, 16 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..d8ac934
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,16 @@
+# 'git shortlog --help' and look for mailmap for the format of each line
+
+# Email consolidation:
+# <Preferred address in AUTHORS> <other alias used by same author>
+
+<jdenemar@redhat.com> <Jiri.Denemark@gmail.com>
+<jfehlig@suse.com> <jfehlig@novell.com>
+<stefanb@us.ibm.com> <stefanb@linux.vnet.ibm.com>
+
+# Name consolidation:
+# Preferred author spelling <preferred email>
+Alex Jia <ajia@redhat.com>
+Ján Tomko <jtomko@redhat.com>
+MATSUDA Daiki <matsudadik@intellilink.co.jp>
+Serge E. Hallyn <serge.hallyn@canonical.com>
+Philipp Hahn <hahn@univention.de>