summaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorPetr Viktorin <pviktori@redhat.com>2014-02-11 12:10:04 +0100
committerPetr Viktorin <pviktori@redhat.com>2014-02-12 14:04:07 +0100
commitf8298a7270797ce1f889775229f456b8d0377fcc (patch)
tree29d330b75462f19b385b10528acdd28dcc9b3535 /.mailmap
parent39ebeae10befd3c7c3d015f67945e2b77217493d (diff)
downloadfreeipa-f8298a7270797ce1f889775229f456b8d0377fcc.tar.gz
freeipa-f8298a7270797ce1f889775229f456b8d0377fcc.tar.xz
freeipa-f8298a7270797ce1f889775229f456b8d0377fcc.zip
Add a .mailmap file
This makes `git shortlog` report correct and consistent names and addresses, even for past commits where the author information is not ideal. See git-shortlog(1) Reviewed-By: Martin Košek <mkosek@redhat.com>
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap50
1 files changed, 50 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
new file mode 100644
index 000000000..6684a61ca
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,50 @@
+Ana Krivokapić <akrivoka@redhat.com> Ana Krivokapic <akrivoka@redhat.com>
+Endi Sukma Dewata <edewata@redhat.com> System Administrator <root@dhcp-100-3-211.bos.redhat.com>
+Endi Sukma Dewata <edewata@redhat.com>
+Jan Zelený <jzeleny@redhat.com>
+Jim Meyering <meyering@redhat.com> <jim@meyering.net>
+John Dennis <jdennis@redhat.com> <jdennis@VAIO>
+Jr Aquino <jr.aquino@citrix.com>
+Jr Aquino <jr.aquino@citrix.com> <Jr.Aquino@citrix.com>
+Jr Aquino <jr.aquino@citrix.com> <jr.aquino@citrixonline.com>
+Karl MacMillan <kmacmill@redhat.com> <kmacmillan@mentalrootkit.com>
+Karl MacMillan <kmacmill@redhat.com> <kmacmillan@redhat.com>
+Karl MacMillan <kmacmill@redhat.com> <kmcmillan@redhat.com>
+Karl MacMillan <kmacmill@redhat.com> <kmcmillan@redhat.com>
+Karl MacMillan <kmcmillan@redhat.com> <kmacmill@speckledhen.hosted.redhat.com>
+Kevin McCarthy <kmccarth@redhat.com>
+Kevin McCarthy <kmccarth@redhat.com> <kmccarth@dhcp-172-16-25-136.sfbay.redhat.com>
+Kevin McCarthy <kmccarth@redhat.com> <kmccarthy@redhat.com>
+Kyle Baker <kybaker@redhat.com> <kbaker@redhat.com>
+Kyle Baker <kybaker@redhat.com> <kylebaker@dhcp-100-2-212.bos.redhat.com>
+Kyle Baker <kybaker@redhat.com> <root@Kyle-Bakers-MacBook-Pro.local>
+Lubomír Rintel <lubo.rintel@gooddata.com> Lubomir Rintel <lubo.rintel@gooddata.com>
+Lukáš Slebodník <lslebodn@redhat.com>
+Martin Bašti <mbasti@redhat.com>
+Martin Košek <mkosek@redhat.com>
+Martin Nagy <mnagy@redhat.com> <mnagy@notas.(none)>
+Nalin Dahyabhai <nalin@redhat.com> <nalin@dahyabhai.net>
+Nalin Dahyabhai <nalin@redhat.com> <nalin.dahyabhai@pobox.com>
+Nikolai Kondrashov <nkondrashov@redhat.com> <Nikolai.Kondrashov@redhat.com>
+Ondřej Hamada <ohamada@redhat.com>
+Pavel Zůna <pzuna@redhat.com>
+Pavel Zůna <pzuna@redhat.com> <root@testbox.pzuna>
+Pavel Zůna <pzuna@redhat.com> <root@testbox.winry>
+Pavel Zůna <pzuna@redhat.com> <root@webui.pzuna>
+Petr Špaček <pspacek@redhat.com>
+Petr Voborník <pvoborni@redhat.com>
+Rich Megginson <rmeggins@redhat.com> <rich@localhost.localdomain>
+Rob Crittenden <rcritten@redhat.com>
+Rob Crittenden <rcritten@redhat.com> <rcrit@ike.greyoak.com>
+Rob Crittenden <rcritten@redhat.com> <rcrit@ipa.greyoak.com>
+Rob Crittenden <rcritten@redhat.com> <rcrit@moon.greyoak.com>
+Rob Crittenden <rcritten@redhat.com> <rcrit@rhel1.greyoak.com>
+Rob Crittenden <rcritten@redhat.com> rcritten <devnull@localhost>
+Rob Crittenden <rcritten@redhat.com> <rcrit@thor.greyoak.com>
+Rob Crittenden <rcritten@redhat.com> <rcrit@tove.greyoak.com>
+Simo Sorce <ssorce@redhat.com> <simo@redhat.com>
+Sumit Bose <sbose@redhat.com> <sbose@ipa17-devel.ipa17.devel>
+Sumit Bose <sbose@redhat.com> <sbose@ipa18-devel.ipa18.devel>
+Tomáš Babej <tbabej@redhat.com>
+Tomáš Babej <tbabej@redhat.com> <tomasbabej@gmail.com>
+William Jon McCann <mccann@jhu.edu> <mccann@jhu.edu>