.mailmap

   1 # 'git shortlog --help' and look for mailmap for the format of each line
   2
   3 # Email consolidation:
   4 # <Preferred address in AUTHORS> <other alias used by same author>
   5
   6 <bozzolan@gmail.com> <redshift@gmx.com>
   7 <charles_duffy@messageone.com> <charles@dyfis.net>
   8 <claudio.bley@gmail.com> <cbley@av-test.de>
   9 <dfj@redhat.com> <dfj@dfj.bne.redhat.com>
  10 <dpkshetty@gmail.com> <deepakcs@linux.vnet.ibm.com>
  11 <dpkshetty@gmail.com> <deepakcs@redhat.com>
  12 <eblake@redhat.com> <ebb9@byu.net>
  13 <gdolley@arpnetworks.com> <gdolley@ucla.edu>
  14 <gerhard.stenzel@de.ibm.com> <gstenzel@linux.vnet.ibm.com>
  15 <jamie@canonical.com> <jamie@ubuntu.com>
  16 <laine@redhat.com> <laine@laine.org>
  17 <meyering@redhat.com> <jim@meyering.net>
  18 <socketpair@gmail.com> <socketpair gmail com>
  19 <soren@linux2go.dk> <soren@ubuntu.com>
  20 <jfehlig@suse.com> <jfehlig@novell.com>
  21 <jfehlig@suse.com> <jfehlig@linux-ypgk.site>
  22 <jclift@redhat.com> <justin@salasaga.org>
  23 <soren@linux2go.dk> <soren@canonical.com>
  24 <cfergeau@redhat.com> <teuf@gnome.org>
  25 <wency@cn.fujitsu.com> <wency cn fujitsu com>
  26 <cardoe@cardoe.com> <cardoe@gentoo.org>
  27 <fsimonce@redhat.com> <federico.simoncelli@gmail.com>
  28 <marcandre.lureau@redhat.com> <marcandre.lureau@gmail.com>
  29 <supriyak@linux.vnet.ibm.com> <supriyak@in.ibm.com>
  30 <neil@aldur.co.uk> <neil@brightbox.co.uk>
  31 <stefanb@us.ibm.com> <stefanb@linux.vnet.ibm.com>
  32 <stefanb@us.ibm.com> <stefannb@linux.vnet.ibm.com>
  33 <josh.durgin@inktank.com> <joshd@hq.newdream.net>
  34 <josh.durgin@inktank.com> <josh.durgin@dreamhost.com>
  35 <gerd@egidy.de> <lists@egidy.de>
  36 <gerd@egidy.de> <gerd.von.egidy@intra2net.com>
  37 <benoar@dolka.fr> <benjamin.cama@telecom-bretagne.eu>
  38 <zhlcindy@linux.vnet.ibm.com> <zhlcindy@gmail.com>
  39 <serge.hallyn@canonical.com> <serue@us.ibm.com>
  40 <pritesh.kothari@sun.com> <Pritesh.Kothari@Sun.COM>
  41 <cbosdonnat@suse.com> <cedric.bosdonnat@free.fr>
  42 <mnestratov@virtuozzo.com> <mnestratov@parallels.com>
  43 <nshirokovskiy@virtuozzo.com> <nshirokovskiy@parallels.com>
  44 <jyang@redhat.com> <osier@yunify.com>
  45 <kkoukiou@redhat.com> <k.koukiou@googlemail.com>
  46
  47 # Name consolidation:
  48 # Preferred author spelling <preferred email>
  49 Alex Jia <ajia@redhat.com>
  50 Royce Lv <lvroyce@linux.vnet.ibm.com>
  51 Daniel J Walsh <dwalsh@redhat.com>
  52 Ján Tomko <jtomko@redhat.com>
  53 Gerd von Egidy <gerd@egidy.de>
  54 MATSUDA Daiki <matsudadik@intellilink.co.jp>
  55 Tang Chen <tangchen@cn.fujitsu.com>
  56 Peng Zhou <ailvpeng25@gmail.com>
  57 Dirk Herrendoerfer <d.herrendoerfer@herrendoerfer.name>
  58 Thibault VINCENT <thibault.vincent@smartjog.com>
  59 Aurelien Rougemont <beorn@binaries.fr>
  60 Serge E. Hallyn <serge.hallyn@canonical.com>
  61 Henrik Persson E <henrik.e.persson@ericsson.com>
  62 Philipp Hahn <hahn@univention.de>
  63 Pritesh Kothari <pritesh.kothari@sun.com>
  64 Wang Yufei (James) <james.wangyufei@huawei.com>
  65 Deepak C Shetty <dpkshetty@gmail.com>
  66 Dave Allan <dallan@redhat.com>
  67 Richard W.M. Jones <rjones@redhat.com>
  68
  69 # Non-trivial consolidation:
  70 # see git documentation for information about the format
  71 Daniel P. Berrangé <berrange@redhat.com>
  72 Daniel P. Berrangé <berrange@redhat.com> <dan@berrange.com>
  73 Michal Prívozník <mprivozn@redhat.com>
  74 Michal Prívozník <mprivozn@redhat.com> <miso.privoznik@gmail.com>
  75 Marco Bozzolan <bozzolan@gmail.com> <redshift@gmx.com>