From: Andrea Bolognani <abologna@redhat.com>
Date: Wed, 4 Jul 2018 11:22:58 +0000 (+0200)
Subject: mailmap: Fix consolidation rules
X-Git-Tag: v4.6.0-rc1~303
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc2ce5cdaa7d71c93222aba51a149adcdf2c3e39;p=thirdparty%2Flibvirt.git

mailmap: Fix consolidation rules

The basic mailmap syntax works for simple cases, but
sometimes it requires two entiries or doesn't work at all;
switch to the more complex syntax in those cases.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
---

diff --git a/.mailmap b/.mailmap
index 47b4a71784..edea456268 100644
--- a/.mailmap
+++ b/.mailmap
@@ -20,7 +20,6 @@
 <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>
@@ -56,9 +55,12 @@ Aurelien Rougemont <beorn@binaries.fr>
 Serge E. Hallyn <serge.hallyn@canonical.com>
 Henrik Persson E <henrik.e.persson@ericsson.com>
 Philipp Hahn <hahn@univention.de>
-Marco Bozzolan <bozzolan@gmail.com>
-Marco Bozzolan <redshift@gmx.com>
 Pritesh Kothari <pritesh.kothari@sun.com>
 Wang Yufei (James) <james.wangyufei@huawei.com>
 Deepak C Shetty <dpkshetty@gmail.com>
+
+# Non-trivial consolidation:
+# see git documentation for information about the format
 Daniel P. Berrangé <berrange@redhat.com>
+Daniel P. Berrangé <berrange@redhat.com> <dan@berrange.com>
+Marco Bozzolan <bozzolan@gmail.com> <redshift@gmx.com>