summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillem Jover <guillem@debian.org>2013-05-17 03:02:27 +0200
committerGuillem Jover <guillem@debian.org>2018-05-07 13:41:31 +0200
commit0bfcb506760fb5b3f40561b4c2a0231d772acbe9 (patch)
treefefc75a5ab414838e7475eb3971abd8cc221694e
parent164f1b78d1849a0f33df7352875f86e28f5de06a (diff)
Normalize authors through a mailmap file
This is used from at least git shortlog.
-rw-r--r--.mailmap18
1 files changed, 18 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
new file mode 100644
index 000000000..c66db1ded
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,18 @@
+# Unify user identities
+Christian Perrier <bubulle@debian.org>
+<ian@davenant.greenend.org.uk> <ian@anarres>
+<ian@davenant.greenend.org.uk> <ian@liberator>
+<jackyf@debian.org> <jackyf@1501-debian>
+Michael Vogt <mvo@debian.org> <egon@debian-vm>
+<mvo@debian.org> <egon@bottom>
+<mvo@debian.org> <egon@debian-devbox>
+<mvo@debian.org> <egon@pop>
+<mvo@debian.org> <egon@tas>
+<michael.vogt@ubuntu.com> <mvo@ubuntu.com>
+# Name changes
+Peter Krefting <peterk@debian.org>
+# Email as user name
+Christian Perrier <bubulle@debian.org> bubulle@debian.org <>
+Julian Andres Klode <jak@debian.org> jak@debian.org <>
+Loïc Minier <lool@dooz.org> lool@dooz.org <>
+Martin Pitt <martin@piware.de> martin@piware.de <>