X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=.mailmap;h=3816e4effe4f23090157cf53d8dfa4e77cdb24a3;hb=42d24611afc7610808ecb8770cf40e84714dd28e;hp=9797802aaa33da51c7a7f1b27aa701109d999677;hpb=9423a2e8dd362a271bfe194ec131062814557b95;p=mirror_qemu.git diff --git a/.mailmap b/.mailmap index 9797802aaa..3816e4effe 100644 --- a/.mailmap +++ b/.mailmap @@ -1,8 +1,23 @@ -# 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. # +# If you are adding to this file consider if a similar change needs to +# be made to contrib/gitdm/aliases. They are not however completely +# analogous. .mailmap is concerned with fixing up damaged author +# fields where as the gitdm equivalent is more concerned with making +# sure multiple email addresses get mapped onto the same author. +# +# From man git-shortlog the forms are: +# +# Proper Name +# +# Proper Name +# Proper Name Commit Name +# + +# 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 aliguori Aurelien Jarno aurel32 Blue Swirl blueswir1 Edgar E. Iglesias edgar_igl @@ -11,6 +26,136 @@ Jocelyn Mayer j_mayer pbrook 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 + +# Next, replace old addresses by a more recent one. +Aleksandar Markovic +Aleksandar Markovic +Aleksandar Rikalo +Anthony Liguori Anthony Liguori +James Hogan +Paul Burton +Paul Burton +Paul Burton +Philippe Mathieu-Daudé +Yongbok Kim + +# Also list preferred name forms where people have changed their +# git author config, or had utf8/latin1 encoding issues. +Aaron Lindsay +Alexey Gerasimenko +Alex Ivanov +Andreas Färber +Bandan Das +Benjamin MARSILI +Benoît Canet +Benoît Canet +Benoît Canet +Boqun Feng +Boqun Feng +Brad Smith +Brijesh Singh +Brilly Wu +Cédric Vincent +CheneyLin +Chen Gang +Chen Gang +Chen Gang +Chen Wei-Ren +Christophe Lyon +Collin L. Walling +Daniel P. Berrangé +Eduardo Otubo +Fabrice Desclaux +Fernando Luis Vázquez Cao +Fernando Luis Vázquez Cao +Gautham R. Shenoy +Gautham R. Shenoy +Gonglei (Arei) +Guang Wang +Hailiang Zhang +Hervé Poussineau +Jakub Jermář +Jakub Jermář +Jean-Christophe Dubois +Jindřich Makovička +John Arbuckle +Juha Riihimäki +Juha Riihimäki +Jun Li +Laurent Vivier +Leandro Lupori +Li Guang +Liming Wang +linzhecheng +Liran Schour +Liu Yu +Liu Yu +Li Zhang +Li Zhang +Lluís Vilanova +Lluís Vilanova +Longpeng (Mike) +Luc Michel +Luc Michel +Marc Marí +Marc Marí +Michael Avdienko +Michael S. Tsirkin +Munkyu Im +Nicholas Bellinger +Nicholas Thomas +Nikunj A Dadhania +Orit Wasserman +Paolo Bonzini +Pavel Dovgaluk +Pavel Dovgaluk +Pavel Dovgaluk +Peter Crosthwaite +Peter Crosthwaite +Peter Crosthwaite +Prasad J Pandit +Prasad J Pandit +Qiao Nuohan +Reimar Döffinger +Remy Noel +Roger Pau Monné +Shin'ichiro Kawasaki +Shin'ichiro Kawasaki +Sochin Jiang +Takashi Yoshii +Thomas Huth +Thomas Knych +Timothy Baldwin +Tony Nguyen +Venkateswararao Jujjuri +Vibi Sreenivasan +Vijaya Kumar K +Vijaya Kumar K +Vijay Kumar +Vijay Kumar +Wang Guang +Wenchao Xia +Wenshuang Ma +Xiaoqiang Zhao +Xinhua Cao +Xiong Zhang +Yin Yin +yuchenlin +YunQiang Su +YunQiang Su +Yuri Pudgorodskiy +Zhengui Li +Zhenwei Pi +Zhenwei Pi +Zhuang Yanying