@@ -89,7 +89,7 @@ Jean-Baptiste Dalido <jeanbaptiste@appgratis.com>

 Sven Dowideit <SvenDowideit@home.org.au>

 Sven Dowideit <SvenDowideit@home.org.au> <SvenDowideit@fosiki.com>

 Sven Dowideit <SvenDowideit@home.org.au> <SvenDowideit@docker.com>

-Sven Dowideit <SvenDowideit@home.org.au> <¨SvenDowideit@home.org.au¨>

+Sven Dowideit <SvenDowideit@home.org.au> <SvenDowideit@home.org.au>

 Sven Dowideit <SvenDowideit@home.org.au> <SvenDowideit@users.noreply.github.com>

 Sven Dowideit <SvenDowideit@home.org.au> <sven@t440s.home.gateway>

 <alexl@redhat.com> <alexander.larsson@gmail.com>

new file mode 100644

@@ -0,0 +1,148 @@

+Danny.Yates@mailonline.co.uk danny@codeaholics.org

+KenCochrane@gmail.com kencochrane@gmail.com

+LÉVEIL thomasleveil@gmail.com

+Vincent.Bernat@exoscale.ch bernat@luffy.cx

+acidburn@docker.com jess@docker.com

+admin@jtlebi.fr jt@yadutaf.fr

+ahmetalpbalkan@gmail.com ahmetb@microsoft.com

+aj@gandi.net aj@gandi.net

+albers@users.noreply.github.com github@albersweb.de

+alexander.larsson@gmail.com alexl@redhat.com

+amurdaca@redhat.com antonio.murdaca@gmail.com

+amy@gandi.net aj@gandi.net

+andrew.weiss@microsoft.com andrew.weiss@outlook.com

+angt@users.noreply.github.com adrien@gallouet.fr

+ankushagarwal@users.noreply.github.com ankushagarwal11@gmail.com

+anonymouse2048@gmail.com lheckemann@twig-world.com

+anusha@docker.com anusha.ragunathan@docker.com

+asarai@suse.com asarai@suse.de

+avi.miller@gmail.com avi.miller@oracle.com

+bernat@luffy.cx Vincent.Bernat@exoscale.ch

+bgoff@cpuguy83-mbp.home cpuguy83@gmail.com

+brandon@ifup.co brandon@ifup.org

+brent@docker.com brent.salisbury@docker.com

+charmes.guillaume@gmail.com guillaume.charmes@docker.com

+chenchun.feed@gmail.com ramichen@tencent.com

+chooper@plumata.com charles.hooper@dotcloud.com

+crosby.michael@gmail.com michael@docker.com

+crosbymichael@gmail.com michael@docker.com

+cyphar@cyphar.com asarai@suse.de

+daehyeok@daehyeok-ui-MacBook-Air.local daehyeok@gmail.com

+daehyeok@daehyeokui-MacBook-Air.local daehyeok@gmail.com

+daniel.norberg@gmail.com dano@spotify.com

+daniel@dotcloud.com daniel.mizyrycki@dotcloud.com

+darren@rancher.com darren.s.shepherd@gmail.com

+dave@dtucker.co.uk dt@docker.com

+dev@vvieux.com victor.vieux@docker.com

+dgasienica@zynga.com daniel@gasienica.ch

+dnephin@gmail.com dnephin@docker.com

+dominikh@fork-bomb.org dominik@honnef.co

+dqminh89@gmail.com dqminh@cloudflare.com

+dsxiao@dataman-inc.com dxiao@redhat.com

+duglin@users.noreply.github.com dug@us.ibm.com

+eric.hanchrow@gmail.com ehanchrow@ine.com

+erik+github@hollensbe.org github@hollensbe.org

+estesp@gmail.com estesp@linux.vnet.ibm.com

+ewindisch@docker.com eric@windisch.us

+f.joffrey@gmail.com joffrey@docker.com

+fkautz@alumni.cmu.edu fkautz@redhat.com

+frank.rosquin@gmail.com frank.rosquin+github@gmail.com

+gh@mattyw.net mattyw@me.com

+git@julienbordellier.com julienbordellier@gmail.com

+github@metaliveblog.com github@developersupport.net

+github@srid.name sridharr@activestate.com

+guillaume.charmes@dotcloud.com guillaume.charmes@docker.com

+guillaume@charmes.net guillaume.charmes@docker.com

+guillaume@docker.com guillaume.charmes@docker.com

+guillaume@dotcloud.com guillaume.charmes@docker.com

+haoshuwei24@gmail.com haosw@cn.ibm.com

+hollie.teal@docker.com hollie@docker.com

+hollietealok@users.noreply.github.com hollie@docker.com

+hsinko@users.noreply.github.com 21551195@zju.edu.cn

+iamironbob@gmail.com altsysrq@gmail.com

+icecrime@gmail.com arnaud.porterie@docker.com

+jatzen@gmail.com jacob@jacobatzen.dk

+jeff@allingeek.com jeff.nickoloff@gmail.com

+jefferya@programmerq.net jeff@docker.com

+jerome.petazzoni@dotcloud.com jerome.petazzoni@dotcloud.com

+jfrazelle@users.noreply.github.com jess@docker.com

+jhoward@microsoft.com John.Howard@microsoft.com

+jlhawn@berkeley.edu josh.hawn@docker.com

+joffrey@dotcloud.com joffrey@docker.com

+john.howard@microsoft.com John.Howard@microsoft.com

+jp@enix.org jerome.petazzoni@dotcloud.com

+justin.cormack@unikernel.com justin.cormack@docker.com

+justin.simonelis@PTS-JSIMON2.toronto.exclamation.com justin.p.simonelis@gmail.com

+justin@specialbusservice.com justin.cormack@docker.com

+katsuta_soshi@cyberagent.co.jp soshi.katsuta@gmail.com

+kuehnle@online.de git.nivoc@neverbox.com

+kwk@users.noreply.github.com konrad.wilhelm.kleine@gmail.com

+leijitang@gmail.com leijitang@huawei.com

+liubin0329@gmail.com liubin0329@users.noreply.github.com

+lk4d4math@gmail.com lk4d4@docker.com

+louis@dotcloud.com kalessin@kalessin.fr

+lsm5@redhat.com lsm5@fedoraproject.org

+lyndaoleary@hotmail.com lyndaoleary29@gmail.com

+madhu@socketplane.io madhu@docker.com

+martins@noironetworks.com aanm90@gmail.com

+mary@docker.com mary.anthony@docker.com

+mastahyeti@users.noreply.github.com mastahyeti@gmail.com

+maztaim@users.noreply.github.com taim@bosboot.org

+me@runcom.ninja antonio.murdaca@gmail.com

+mheon@mheonlaptop.redhat.com mheon@redhat.com

+michael@crosbymichael.com michael@docker.com

+mohitsoni1989@gmail.com mosoni@ebay.com

+moxieandmore@gmail.com mary.anthony@docker.com

+moyses.furtado@wplex.com.br moysesb@gmail.com

+msabramo@gmail.com marc@marc-abramowitz.com

+mzdaniel@glidelink.net daniel.mizyrycki@dotcloud.com

+nathan.leclaire@gmail.com nathan.leclaire@docker.com

+nathanleclaire@gmail.com nathan.leclaire@docker.com

+ostezer@users.noreply.github.com ostezer@gmail.com

+peter@scraperwiki.com p@pwaller.net

+princess@docker.com jess@docker.com

+proppy@aminche.com proppy@google.com

+qhuang@10.0.2.15 h.huangqiang@huawei.com

+resouer@gmail.com resouer@163.com

+roberto_hashioka@hotmail.com roberto.hashioka@docker.com

+root@vagrant-ubuntu-12.10.vagrantup.com daniel.mizyrycki@dotcloud.com

+runcom@linux.com antonio.murdaca@gmail.com

+runcom@redhat.com antonio.murdaca@gmail.com

+runcom@users.noreply.github.com antonio.murdaca@gmail.com

+s@docker.com solomon@docker.com

+shawnlandden@gmail.com shawn@churchofgit.com

+singh.gurjeet@gmail.com gurjeet@singh.im

+sjoerd@byte.nl sjoerd-github@linuxonly.nl

+smahajan@redhat.com shishir.mahajan@redhat.com

+solomon.hykes@dotcloud.com solomon@docker.com

+solomon@dotcloud.com solomon@docker.com

+stefanb@us.ibm.com stefanb@linux.vnet.ibm.com

+stevvooe@users.noreply.github.com stephen.day@docker.com

+superbaloo+registrations.github@superbaloo.net baloo@gandi.net

+tangicolin@gmail.com tangicolin@gmail.com

+thaJeztah@users.noreply.github.com github@gone.nl

+thatcher@dotcloud.com thatcher@docker.com

+thatcher@gmx.net thatcher@docker.com

+tibor@docker.com teabee89@gmail.com

+tiborvass@users.noreply.github.com teabee89@gmail.com

+timruffles@googlemail.com oi@truffles.me.uk

+tintypemolly@Ohui-MacBook-Pro.local tintypemolly@gmail.com

+tj@init.me tejesh.mehta@gmail.com

+tristan.carel@gmail.com tristan@cogniteev.com

+unclejack@users.noreply.github.com cristian.staretu@gmail.com

+unclejacksons@gmail.com cristian.staretu@gmail.com

+vbatts@hashbangbash.com vbatts@redhat.com

+victor.vieux@dotcloud.com victor.vieux@docker.com

+victor@docker.com victor.vieux@docker.com

+victor@dotcloud.com victor.vieux@docker.com

+victorvieux@gmail.com victor.vieux@docker.com

+vieux@docker.com victor.vieux@docker.com

+vincent+github@demeester.fr vincent@sbr.pm

+vincent@bernat.im bernat@luffy.cx

+vojnovski@gmail.com viktor.vojnovski@amadeus.com

+whoshuu@gmail.com huu@prismskylabs.com

+xiaods@gmail.com dxiao@redhat.com

+xlgao@zju.edu.cn xlgao@zju.edu.cn

+yestin.sun@polyera.com sunyi0804@gmail.com

+yuchangchun1@huawei.com yuchangchun1@huawei.com

+zjaffee@us.ibm.com zij@case.edu

new file mode 100644

@@ -0,0 +1,39 @@

+#

+# Docker

+#

+

+docker.com                      Docker

+dotcloud.com                    Docker

+

+aluzzardi@gmail.com             Docker

+cpuguy83@gmail.com              Docker

+derek@mcgstyle.net              Docker

+github@gone.nl                  Docker

+kencochrane@gmail.com           Docker

+mickael.laventure@gmail.com     Docker

+sam.alba@gmail.com              Docker

+svendowideit@fosiki.com         Docker

+svendowideit@home.org.au        Docker

+tonistiigi@gmail.com            Docker

+

+cristian.staretu@gmail.com      Docker      < 2015-01-01

+cristian.staretu@gmail.com      Cisco

+

+github@hollensbe.org            Docker      < 2015-01-01

+github@hollensbe.org            Cisco

+

+david.calavera@gmail.com        Docker      < 2016-04-01

+david.calavera@gmail.com        Netlify

+

+#

+# Others

+#

+

+cisco.com                       Cisco

+google.com                      Google

+ibm.com                         IBM

+huawei.com                      Huawei

+microsoft.com                   Microsoft

+

+redhat.com                      Red Hat

+mrunalp@gmail.com               Red Hat

new file mode 100755

@@ -0,0 +1,16 @@

+#!/bin/bash

+

+#

+# This script generates a gitdm compatible email aliases file from a git

+# formatted .mailmap file.

+#

+# Usage:

+#  $> ./generate_aliases <mailmap_file> > aliases

+#

+

+cat $1 | \

+    grep -v '^#' | \

+    sed 's/^[^<]*<\([^>]*\)>/\1/' | \

+    grep '<.*>' | sed -e 's/[<>]/ /g' | \

+    awk '{if ($3 != "") { print $3" "$1 } else {print $2" "$1}}' | \

+    sort | uniq

new file mode 100644

@@ -0,0 +1,17 @@

+#

+# EmailAliases lets us cope with developers who use more

+# than one address.

+#

+EmailAliases aliases

+

+#

+# EmailMap does the main work of mapping addresses onto 

+# employers.

+#

+EmailMap domain-map

+

+#

+# Use GroupMap to map a file full of addresses to the 

+# same employer

+#

+# GroupMap company-Docker  Docker