2011-09-19 22:34:10 +00:00
|
|
|
# 'git shortlog --help' and look for mailmap for the format of each line
|
|
|
|
|
|
|
|
# Email consolidation:
|
2011-04-20 23:00:30 +00:00
|
|
|
# <Preferred address in AUTHORS> <other alias used by same author>
|
|
|
|
|
2010-05-28 09:27:12 +00:00
|
|
|
<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>
|
2010-08-10 14:13:22 +00:00
|
|
|
<soren@linux2go.dk> <soren@ubuntu.com>
|
2011-09-01 22:13:34 +00:00
|
|
|
<jfehlig@suse.com> <jfehlig@novell.com>
|
|
|
|
<jfehlig@suse.com> <jfehlig@linux-ypgk.site>
|
2010-07-09 09:35:39 +00:00
|
|
|
<jclift@redhat.com> <justin@salasaga.org>
|
2010-07-23 09:43:45 +00:00
|
|
|
<berrange@redhat.com> <dan@berrange.com>
|
2010-08-10 14:13:22 +00:00
|
|
|
<soren@linux2go.dk> <soren@canonical.com>
|
2011-04-14 09:22:35 +00:00
|
|
|
<cfergeau@redhat.com> <teuf@gnome.org>
|
2011-04-20 23:00:30 +00:00
|
|
|
<wency@cn.fujitsu.com> <wency cn fujitsu com>
|
2011-05-20 20:18:09 +00:00
|
|
|
<cardoe@cardoe.com> <cardoe@gentoo.org>
|
2011-05-13 10:11:47 +00:00
|
|
|
<fsimonce@redhat.com> <federico.simoncelli@gmail.com>
|
2011-06-14 11:35:48 +00:00
|
|
|
<marcandre.lureau@redhat.com> <marcandre.lureau@gmail.com>
|
2011-06-30 08:22:20 +00:00
|
|
|
<supriyak@linux.vnet.ibm.com> <supriyak@in.ibm.com>
|
2011-10-03 09:58:55 +00:00
|
|
|
<neil@aldur.co.uk> <neil@brightbox.co.uk>
|
2011-11-11 15:22:23 +00:00
|
|
|
<stefanb@us.ibm.com> <stefanb@linux.vnet.ibm.com>
|
2012-08-09 21:31:58 +00:00
|
|
|
<stefanb@us.ibm.com> <stefannb@linux.vnet.ibm.com>
|
2012-07-02 18:55:26 +00:00
|
|
|
<josh.durgin@inktank.com> <joshd@hq.newdream.net>
|
|
|
|
<josh.durgin@inktank.com> <josh.durgin@dreamhost.com>
|
2012-07-30 08:42:59 +00:00
|
|
|
<gerd@egidy.de> <lists@egidy.de>
|
|
|
|
<gerd@egidy.de> <gerd.von.egidy@intra2net.com>
|
2011-09-19 22:34:10 +00:00
|
|
|
|
|
|
|
# Name consolidation:
|
|
|
|
# Preferred author spelling <preferred email>
|
|
|
|
Alex Jia <ajia@redhat.com>
|
2012-07-09 18:08:52 +00:00
|
|
|
Royce Lv <lvroyce@linux.vnet.ibm.com>
|
2012-07-18 21:34:53 +00:00
|
|
|
Daniel J Walsh <dwalsh@redhat.com>
|
2012-07-26 14:05:51 +00:00
|
|
|
Ján Tomko <jtomko@redhat.com>
|
2012-07-30 08:42:59 +00:00
|
|
|
Gerd von Egidy <gerd@egidy.de>
|