Signed-off-by: Philippe Mathieu-Daudé <[email protected]> --- .mailmap | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-)
diff --git a/.mailmap b/.mailmap index 6f2ff22a45..8475adf799 100644 --- a/.mailmap +++ b/.mailmap @@ -4,26 +4,31 @@ # 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> -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> - # There is also a: # (no author) <(no author)@c046a42c-6fe2-441c-8c8c-71466251a162> # for the cvs2svn initialization commit e63c3dc74bf. + +# This section is to track prefered (or last up to date) email for people +# that uses (or had use) various emails. +# Example can be people changing from companies, or companies changing their +# name. +Aleksandar Markovic <[email protected]> <[email protected]> +Anthony Liguori <[email protected]> Anthony Liguori <[email protected]> +James Hogan <[email protected]> <[email protected]> +Paul Burton <[email protected]> <[email protected]> +Paul Burton <[email protected]> <[email protected]> +Paul Burton <[email protected]> <[email protected]> + + # Next, translate a few commits where mailman rewrote the From: line due # to strict SPF, although we prefer to avoid adding more entries like that. Ed Swierk <[email protected]> Ed Swierk via Qemu-devel <[email protected]> -- 2.19.1
