summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorJulian Andres Klode <jak@debian.org>2018-05-09 08:15:54 +0000
committerJulian Andres Klode <jak@debian.org>2018-05-09 08:15:54 +0000
commitbb36d9ede3f374dd24fdce7493d9fcbe92e1e7c8 (patch)
treefd1fed8a732d6e636a40cf74172fbf8d9c356f28 /.mailmap
parente85987ab2281e765a2b3e19aefe7f99f656428d8 (diff)
parent179e456d2e3fb091934cd2c99579af10b6796149 (diff)
Merge branch 'pu/cleanup' into 'master'
Repository cleanups See merge request apt-team/apt!12
Diffstat (limited to '.mailmap')
-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 <>