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