# 'git shortlog --help' and look for mailmap for the format of each line # Email consolidation: # <Preferred address in AUTHORS> <other alias used by same author> <amy.griffis@hp.com> <aron.griffis@hp.com> <bozzolan@gmail.com> <redshift@gmx.com> <charles_duffy@messageone.com> <charles@dyfis.net> <dfj@redhat.com> <dfj@dfj.bne.redhat.com> <eblake@redhat.com> <ebb9@byu.net> <gdolley@arpnetworks.com> <gdolley@ucla.edu> <gerhard.stenzel@de.ibm.com> <gstenzel@linux.vnet.ibm.com> <jamie@canonical.com> <jamie@ubuntu.com> <laine@redhat.com> <laine@laine.org> <meyering@redhat.com> <jim@meyering.net> <socketpair@gmail.com> <socketpair gmail com> <soren@linux2go.dk> <soren@ubuntu.com> <jfehlig@suse.com> <jfehlig@novell.com> <jfehlig@suse.com> <jfehlig@linux-ypgk.site> <jclift@redhat.com> <justin@salasaga.org> <berrange@redhat.com> <dan@berrange.com> <soren@linux2go.dk> <soren@canonical.com> <cfergeau@redhat.com> <teuf@gnome.org> <wency@cn.fujitsu.com> <wency cn fujitsu com> <cardoe@cardoe.com> <cardoe@gentoo.org> <fsimonce@redhat.com> <federico.simoncelli@gmail.com> <marcandre.lureau@redhat.com> <marcandre.lureau@gmail.com> <supriyak@linux.vnet.ibm.com> <supriyak@in.ibm.com> <neil@aldur.co.uk> <neil@brightbox.co.uk> # Name consolidation: # Preferred author spelling <preferred email> Alex Jia <ajia@redhat.com>