From: Philippe Mathieu-Daudé <[email protected]> Our mailmap currently has 4 sections somehow documented. Reorder few entries not related to "addresses from the original git import" into the 3rd section, and add a comment to describe it.
Signed-off-by: Philippe Mathieu-Daudé <[email protected]> Reviewed-by: Aleksandar Markovic <[email protected]> Message-Id: <[email protected]> Signed-off-by: Alex Bennée <[email protected]> --- .mailmap | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/.mailmap b/.mailmap index b8e08297c90..e1fdc88d25d 100644 --- a/.mailmap +++ b/.mailmap @@ -4,20 +4,12 @@ # into proper addresses so that they are counted properly by git shortlog. Andrzej Zaborowski <[email protected]> balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162> Anthony Liguori <[email protected]> aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> -Anthony Liguori <[email protected]> Anthony Liguori <[email protected]> Aurelien Jarno <[email protected]> aurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162> Blue Swirl <[email protected]> blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162> Edgar E. Iglesias <[email protected]> edgar_igl <edgar_igl@c046a42c-6fe2-441c-8c8c-71466251a162> Fabrice Bellard <[email protected]> bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> -James Hogan <[email protected]> <[email protected]> Jocelyn Mayer <[email protected]> j_mayer <j_mayer@c046a42c-6fe2-441c-8c8c-71466251a162> Paul Brook <[email protected]> pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162> -Yongbok Kim <[email protected]> <[email protected]> -Aleksandar Markovic <[email protected]> <[email protected]> -Aleksandar Markovic <[email protected]> <[email protected]> -Paul Burton <[email protected]> <[email protected]> -Paul Burton <[email protected]> <[email protected]> -Paul Burton <[email protected]> <[email protected]> Thiemo Seufer <[email protected]> ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162> malc <[email protected]> malc <malc@c046a42c-6fe2-441c-8c8c-71466251a162> @@ -32,6 +24,15 @@ Ian McKellar <[email protected]> Ian McKellar via Qemu-devel <qemu-devel@nongnu Julia Suvorova <[email protected]> Julia Suvorova via Qemu-devel <[email protected]> Justin Terry (VM) <[email protected]> Justin Terry (VM) via Qemu-devel <[email protected]> +# Next, replace old addresses by a more recent one. +Anthony Liguori <[email protected]> Anthony Liguori <[email protected]> +James Hogan <[email protected]> <[email protected]> +Aleksandar Markovic <[email protected]> <[email protected]> +Aleksandar Markovic <[email protected]> <[email protected]> +Paul Burton <[email protected]> <[email protected]> +Paul Burton <[email protected]> <[email protected]> +Paul Burton <[email protected]> <[email protected]> +Yongbok Kim <[email protected]> <[email protected]> # Also list preferred name forms where people have changed their # git author config, or had utf8/latin1 encoding issues. -- 2.20.1
