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> --- .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@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> -- 2.17.1