From d6fb294346f0dc8a2e8218ae615502efd7cc2014 Mon Sep 17 00:00:00 2001
From: Eric Blake <eblake@redhat.com>
Date: Mon, 19 Sep 2011 16:34:10 -0600
Subject: [PATCH] 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.
---
 .mailmap | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index 27950476fe..583fe7bc80 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>