aboutsummaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorJake Petroules <jake.petroules@qt.io>2017-08-07 14:24:22 -0700
committerJake Petroules <jake.petroules@qt.io>2017-08-08 16:03:23 +0000
commit1d4a716af28d167cc151f30f8f621727579b70fc (patch)
tree9667db0677097c7f246e3486a80bf36e86a9c4dc /.mailmap
parent313381e1f75e2d09437f3d007927f72c5c16fae9 (diff)
Add a .mailmap file
This properly combines commits from the same author in stats like in `git shortlog`. Change-Id: Ic3fabde867a4e0882115e09966e183085d07cb54 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap28
1 files changed, 28 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
new file mode 100644
index 000000000..dc306c9fe
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,28 @@
+<ABBAPOH@gmail.com> <ABBAPOH@me.com>
+<bogdan@kdab.com> <bogdan@kde.org>
+<christian.kandeler@qt.io> <christian.kandeler@digia.com>
+<christian.kandeler@qt.io> <christian.kandeler@nokia.com>
+<christian.kandeler@qt.io> <christian.kandeler@theqtcompany.com>
+<christian.stenger@qt.io> <christian.stenger@digia.com>
+<eike.ziller@qt.io> <eike.ziller@digia.com>
+<eike.ziller@qt.io> <eike.ziller@theqtcompany.com>
+<friedemann.kleint@qt.io> <Friedemann.Kleint@nokia.com>
+<hjk@qt.io> <qtc-committer@nokia.com>
+<hjk@qt.io> <qthjk@ovi.com>
+<jake.petroules@qt.io> <jake.petroules@petroules.com>
+<jake.petroules@qt.io> <jake.petroules@theqtcompany.com>
+<joerg.bornemann@qt.io> <joerg.bornemann@digia.com>
+<joerg.bornemann@qt.io> <joerg.bornemann@nokia.com>
+<joerg.bornemann@qt.io> <joerg.bornemann@theqtcompany.com>
+<kai.koehne@qt.io> <kai.koehne@digia.com>
+<kai.koehne@qt.io> <kai.koehne@theqtcompany.com>
+<marco.bubke@qt.io> <marco.bubke@nokia.com>
+<orgad.shaneh@audiocodes.com> <orgads@gmail.com>
+<oswald.buddenhagen@qt.io> <oswald.buddenhagen@digia.com>
+<oswald.buddenhagen@qt.io> <oswald.buddenhagen@theqtcompany.com>
+<riitta-leena.miettinen@qt.io> <riitta-leena.miettinen@digia.com>
+<riitta-leena.miettinen@qt.io> <riitta-leena.miettinen@nokia.com>
+<riitta-leena.miettinen@qt.io> <riitta-leena.miettinen@theqtcompany.com>
+<robert.loehning@qt.io> <robert.loehning@digia.com>
+<tobias.hunger@qt.io> <tobias.hunger@digia.com>
+<topi.reinio@qt.io> <topi.reinio@digia.com>