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 <abolo...@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 @@ <jfeh...@suse.com> <jfeh...@novell.com> <jfeh...@suse.com> <jfeh...@linux-ypgk.site> <jcl...@redhat.com> <jus...@salasaga.org> -<berra...@redhat.com> <d...@berrange.com> <so...@linux2go.dk> <so...@canonical.com> <cferg...@redhat.com> <t...@gnome.org> <we...@cn.fujitsu.com> <wency cn fujitsu com> @@ -56,9 +55,12 @@ Aurelien Rougemont <be...@binaries.fr> Serge E. Hallyn <serge.hal...@canonical.com> Henrik Persson E <henrik.e.pers...@ericsson.com> Philipp Hahn <h...@univention.de> -Marco Bozzolan <bozzo...@gmail.com> -Marco Bozzolan <redsh...@gmx.com> Pritesh Kothari <pritesh.koth...@sun.com> Wang Yufei (James) <james.wangyu...@huawei.com> Deepak C Shetty <dpkshe...@gmail.com> + +# Non-trivial consolidation: +# see git documentation for information about the format Daniel P. Berrangé <berra...@redhat.com> +Daniel P. Berrangé <berra...@redhat.com> <d...@berrange.com> +Marco Bozzolan <bozzo...@gmail.com> <redsh...@gmx.com> -- 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
