aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Blake <eblake@redhat.com>2011-09-19 16:34:10 -0600
committerEric Blake <eblake@redhat.com>2011-09-19 16:34:10 -0600
commitd6fb294346f0dc8a2e8218ae615502efd7cc2014 (patch)
treed9d575402f5cf9ab307a2d50d9a342e039b2a871 /.mailmap
parentvirsh: Add more human-friendly output of domblkstat command (diff)
downloadlibvirt-d6fb294346f0dc8a2e8218ae615502efd7cc2014.tar.gz
libvirt-d6fb294346f0dc8a2e8218ae615502efd7cc2014.tar.bz2
libvirt-d6fb294346f0dc8a2e8218ae615502efd7cc2014.zip
maint: Prefer names over email in 'git shortlog'
Alex recently committed some patches with just an email instead of a preferred name; this fixes things so 'git shortlog' gives nicer output. * .mailmap: Update.
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap8
1 files changed, 7 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap
index 27950476f..583fe7bc8 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,4 +1,6 @@
-# Format of each line:
+# '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>
@@ -24,3 +26,7 @@
<fsimonce@redhat.com> <federico.simoncelli@gmail.com>
<marcandre.lureau@redhat.com> <marcandre.lureau@gmail.com>
<supriyak@linux.vnet.ibm.com> <supriyak@in.ibm.com>
+
+# Name consolidation:
+# Preferred author spelling <preferred email>
+Alex Jia <ajia@redhat.com>