X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=.mailmap;h=778a4d4e2c70ffa7d7a9b647f9852b515542a762;hb=92c7eec10926eaff161a91624f399b4afe6cb273;hp=7b91a95d95d045bfb25ad8608d944e5b9e266b4d;hpb=237e4f92a81696e5359766a7f19a77a9ff1d02e5;p=mirror_qemu.git diff --git a/.mailmap b/.mailmap index 7b91a95d95..778a4d4e2c 100644 --- a/.mailmap +++ b/.mailmap @@ -1,16 +1,34 @@ -# This mailmap just translates the weird addresses from the original import into git -# into proper addresses so that they are counted properly in git shortlog output. -# +# This mailmap fixes up author names/addresses. + +# The first section translates weird addresses from the original git import +# into proper addresses so that they are counted properly by git shortlog. Andrzej Zaborowski balrog Anthony Liguori aliguori +Anthony Liguori Anthony Liguori Aurelien Jarno aurel32 Blue Swirl blueswir1 Edgar E. Iglesias edgar_igl Fabrice Bellard bellard +James Hogan Jocelyn Mayer j_mayer Paul Brook pbrook +Paul Burton +Paul Burton Thiemo Seufer ths malc malc + # There is also a: # (no author) <(no author)@c046a42c-6fe2-441c-8c8c-71466251a162> # for the cvs2svn initialization commit e63c3dc74bf. + +# 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 Ed Swierk via Qemu-devel +Ian McKellar Ian McKellar via Qemu-devel +Julia Suvorova Julia Suvorova via Qemu-devel +Justin Terry (VM) Justin Terry (VM) via Qemu-devel + + +# Also list preferred name forms where people have changed their +# git author config +Daniel P. Berrangé