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@xxxxxxxxxx> --- .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@xxxxxxxx> <jfehlig@xxxxxxxxxx> <jfehlig@xxxxxxxx> <jfehlig@xxxxxxxxxxxxxxx> <jclift@xxxxxxxxxx> <justin@xxxxxxxxxxxx> -<berrange@xxxxxxxxxx> <dan@xxxxxxxxxxxx> <soren@xxxxxxxxxxx> <soren@xxxxxxxxxxxxx> <cfergeau@xxxxxxxxxx> <teuf@xxxxxxxxx> <wency@xxxxxxxxxxxxxx> <wency cn fujitsu com> @@ -56,9 +55,12 @@ Aurelien Rougemont <beorn@xxxxxxxxxxx> Serge E. Hallyn <serge.hallyn@xxxxxxxxxxxxx> Henrik Persson E <henrik.e.persson@xxxxxxxxxxxx> Philipp Hahn <hahn@xxxxxxxxxxxxx> -Marco Bozzolan <bozzolan@xxxxxxxxx> -Marco Bozzolan <redshift@xxxxxxx> Pritesh Kothari <pritesh.kothari@xxxxxxx> Wang Yufei (James) <james.wangyufei@xxxxxxxxxx> Deepak C Shetty <dpkshetty@xxxxxxxxx> + +# Non-trivial consolidation: +# see git documentation for information about the format Daniel P. Berrangé <berrange@xxxxxxxxxx> +Daniel P. Berrangé <berrange@xxxxxxxxxx> <dan@xxxxxxxxxxxx> +Marco Bozzolan <bozzolan@xxxxxxxxx> <redshift@xxxxxxx> -- 2.17.1 -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list
