From 3d4daddc7041724fc92b33d9495afa395cc5d995 Mon Sep 17 00:00:00 2001
From: Bernhard Voelker <mail@bernhard-voelker.de>
Date: Thu, 12 Feb 2015 14:21:40 +0100
Subject: [PATCH] maint: enhance '.mailmap' mappings for THANKS generation
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

* .mailmap (jeff.liu@oracle.com): There are 3 different names in the
'git log' output for this email address; choose "Jeff Liu" as canonical
form.
(Алексей Шилин): Convert name to latin1 ("Aleksej Shilin")
to improve the sort order of the generated 'THANKS' file.
---
 .mailmap | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.mailmap b/.mailmap
index d23a2c8a86..c7a18cfb3a 100644
--- a/.mailmap
+++ b/.mailmap
@@ -34,3 +34,10 @@ Arne Henrik Juul <arnej@imf.unit.no> Arne H. Juul <arnej@solan.unit.no>
 
 # Had email as name.
 Dan Jacobson <jidanni@jidanni.org> jidanni@jidanni.org <jidanni@jidanni.org>
+
+# Consolidate names of same email address.
+Jeff Liu <jeff.liu@oracle.com> jeff.liu <jeff.liu@oracle.com>
+Jeff Liu <jeff.liu@oracle.com> Jie Liu <jeff.liu@oracle.com>
+
+# Convert to latin1 for a better 'THANKS' sort order.
+Aleksej Shilin <rootlexx@mail.ru> Алексей Шилин <rootlexx@mail.ru>
-- 
2.47.2