[libvirt] [PATCH 3/5] mailmap: Fix consolidation rules

[Andrea Bolognani]

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 at redhat.com>
---
 .mailmap | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.mailmap b/.mailmap
index 47b4a71784..edea456268 100644
--- a/.mailmap
+++ b/.mailmap
@@ -20,7 +20,6 @@
 <jfehlig at suse.com> <jfehlig at novell.com>
 <jfehlig at suse.com> <jfehlig at linux-ypgk.site>
 <jclift at redhat.com> <justin at salasaga.org>
-<berrange at redhat.com> <dan at berrange.com>
 <soren at linux2go.dk> <soren at canonical.com>
 <cfergeau at redhat.com> <teuf at gnome.org>
 <wency at cn.fujitsu.com> <wency cn fujitsu com>
@@ -56,9 +55,12 @@ Aurelien Rougemont <beorn at binaries.fr>
 Serge E. Hallyn <serge.hallyn at canonical.com>
 Henrik Persson E <henrik.e.persson at ericsson.com>
 Philipp Hahn <hahn at univention.de>
-Marco Bozzolan <bozzolan at gmail.com>
-Marco Bozzolan <redshift at gmx.com>
 Pritesh Kothari <pritesh.kothari at sun.com>
 Wang Yufei (James) <james.wangyufei at huawei.com>
 Deepak C Shetty <dpkshetty at gmail.com>
+
+# Non-trivial consolidation:
+# see git documentation for information about the format
 Daniel P. Berrangé <berrange at redhat.com>
+Daniel P. Berrangé <berrange at redhat.com> <dan at berrange.com>
+Marco Bozzolan <bozzolan at gmail.com> <redshift at gmx.com>
-- 
2.17.1