]>
Commit | Line | Data |
---|---|---|
3bd2608d | 1 | # This mailmap fixes up author names/addresses. |
f4cf1edc AB |
2 | # |
3 | # If you are adding to this file consider if a similar change needs to | |
4 | # be made to contrib/gitdm/aliases. They are not however completely | |
5 | # analogous. .mailmap is concerned with fixing up damaged author | |
6 | # fields where as the gitdm equivalent is more concerned with making | |
7 | # sure multiple email addresses get mapped onto the same author. | |
8 | # | |
9 | # From man git-shortlog the forms are: | |
10 | # | |
11 | # Proper Name <[email protected]> | |
12 | # <[email protected]> <[email protected]> | |
13 | # Proper Name <[email protected]> <[email protected]> | |
14 | # Proper Name <[email protected]> Commit Name <[email protected]> | |
15 | # | |
3bd2608d EB |
16 | |
17 | # The first section translates weird addresses from the original git import | |
18 | # into proper addresses so that they are counted properly by git shortlog. | |
4cb01658 | 19 | Andrzej Zaborowski <[email protected]> balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162> |
bc02fb30 | 20 | Anthony Liguori <[email protected]> aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> |
4cb01658 PM |
21 | Aurelien Jarno <[email protected]> aurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162> |
22 | Blue Swirl <[email protected]> blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162> | |
23 | Edgar E. Iglesias <[email protected]> edgar_igl <edgar_igl@c046a42c-6fe2-441c-8c8c-71466251a162> | |
24 | Fabrice Bellard <[email protected]> bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> | |
25 | Jocelyn Mayer <[email protected]> j_mayer <j_mayer@c046a42c-6fe2-441c-8c8c-71466251a162> | |
26 | Paul Brook <[email protected]> pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162> | |
27 | Thiemo Seufer <[email protected]> ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162> | |
28 | malc <[email protected]> malc <malc@c046a42c-6fe2-441c-8c8c-71466251a162> | |
3bd2608d | 29 | |
82585a31 | 30 | # Corrupted Author fields |
b8003f99 AB |
31 | Aaron Larson <[email protected]> [email protected] |
32 | Andreas Färber <[email protected]> Andreas Färber <andreas.faerber> | |
33 | Jason Wang <[email protected]> Jason Wang <jasowang> | |
82585a31 | 34 | Marek Dolata <[email protected]> [email protected] <[email protected]> |
b8003f99 | 35 | Michael Ellerman <[email protected]> [email protected] <[email protected]> |
82585a31 AB |
36 | Nick Hudson <[email protected]> [email protected] <[email protected]> |
37 | ||
4cb01658 PM |
38 | # There is also a: |
39 | # (no author) <(no author)@c046a42c-6fe2-441c-8c8c-71466251a162> | |
40 | # for the cvs2svn initialization commit e63c3dc74bf. | |
3bd2608d EB |
41 | |
42 | # Next, translate a few commits where mailman rewrote the From: line due | |
43 | # to strict SPF, although we prefer to avoid adding more entries like that. | |
44 | Ed Swierk <[email protected]> Ed Swierk via Qemu-devel <[email protected]> | |
45 | Ian McKellar <[email protected]> Ian McKellar via Qemu-devel <[email protected]> | |
46 | Julia Suvorova <[email protected]> Julia Suvorova via Qemu-devel <[email protected]> | |
47 | Justin Terry (VM) <[email protected]> Justin Terry (VM) via Qemu-devel <[email protected]> | |
48 | ||
6b97a1d8 | 49 | # Next, replace old addresses by a more recent one. |
0eac70b0 AM |
50 | Aleksandar Markovic <[email protected]> <[email protected]> |
51 | Aleksandar Markovic <[email protected]> <[email protected]> | |
52 | Aleksandar Markovic <[email protected]> <[email protected]> | |
97d89746 AM |
53 | Aleksandar Rikalo <[email protected]> <[email protected]> |
54 | Aleksandar Rikalo <[email protected]> <[email protected]> | |
0f57f8d8 | 55 | Alexander Graf <[email protected]> <[email protected]> |
63640d6a | 56 | Anthony Liguori <[email protected]> Anthony Liguori <[email protected]> |
2c092950 | 57 | Christian Borntraeger <[email protected]> <[email protected]> |
cdcb6395 | 58 | Filip Bozuta <[email protected]> <[email protected]> |
034e050d FK |
59 | Frederic Konrad <[email protected]> <[email protected]> |
60 | Frederic Konrad <[email protected]> <[email protected]> | |
3c9ef9c0 | 61 | Greg Kurz <[email protected]> <[email protected]> |
dab1e1e1 HC |
62 | Huacai Chen <[email protected]> <[email protected]> |
63 | Huacai Chen <[email protected]> <[email protected]> | |
63640d6a | 64 | James Hogan <[email protected]> <[email protected]> |
14d5addc LL |
65 | Leif Lindholm <[email protected]> <[email protected]> |
66 | Leif Lindholm <[email protected]> <[email protected]> | |
428a3777 | 67 | Radoslaw Biernacki <[email protected]> <[email protected]> |
13b2918f | 68 | Paul Brook <[email protected]> <[email protected]> |
2b107c2c PMD |
69 | Paul Burton <[email protected]> <[email protected]> |
70 | Paul Burton <[email protected]> <[email protected]> | |
71 | Paul Burton <[email protected]> <[email protected]> | |
72 | Paul Burton <[email protected]> <[email protected]> | |
8823ef13 PMD |
73 | Philippe Mathieu-Daudé <[email protected]> <[email protected]> |
74 | Philippe Mathieu-Daudé <[email protected]> <[email protected]> | |
75 | Philippe Mathieu-Daudé <[email protected]> <[email protected]> | |
f364a8d0 | 76 | Stefan Brankovic <[email protected]> <[email protected]> |
6b97a1d8 | 77 | Yongbok Kim <[email protected]> <[email protected]> |
3bd2608d | 78 | |
57bf554c | 79 | # Also list preferred name forms where people have changed their |
d668c82b | 80 | # git author config, or had utf8/latin1 encoding issues. |
1fed8f00 | 81 | Aaron Lindsay <[email protected]> |
b8003f99 | 82 | Aaron Larson <[email protected]> |
1fed8f00 | 83 | Alexey Gerasimenko <[email protected]> |
63a0eb69 | 84 | Alex Chen <[email protected]> |
1fed8f00 PMD |
85 | Alex Ivanov <[email protected]> |
86 | Andreas Färber <[email protected]> | |
87 | Bandan Das <[email protected]> | |
88 | Benjamin MARSILI <[email protected]> | |
89 | Benoît Canet <[email protected]> | |
90 | Benoît Canet <[email protected]> | |
91 | Benoît Canet <[email protected]> | |
92 | Boqun Feng <[email protected]> | |
93 | Boqun Feng <[email protected]> | |
94 | Brad Smith <[email protected]> | |
95 | Brijesh Singh <[email protected]> | |
96 | Brilly Wu <[email protected]> | |
97 | Cédric Vincent <[email protected]> | |
98 | CheneyLin <[email protected]> | |
99 | Chen Gang <[email protected]> | |
100 | Chen Gang <[email protected]> | |
101 | Chen Gang <[email protected]> | |
102 | Chen Wei-Ren <[email protected]> | |
103 | Christophe Lyon <[email protected]> | |
104 | Collin L. Walling <[email protected]> | |
57bf554c | 105 | Daniel P. Berrangé <[email protected]> |
1fed8f00 | 106 | Eduardo Otubo <[email protected]> |
98d3a724 | 107 | Erik Smit <[email protected]> |
1fed8f00 PMD |
108 | Fabrice Desclaux <[email protected]> |
109 | Fernando Luis Vázquez Cao <[email protected]> | |
110 | Fernando Luis Vázquez Cao <[email protected]> | |
111 | Gautham R. Shenoy <[email protected]> | |
112 | Gautham R. Shenoy <[email protected]> | |
113 | Gonglei (Arei) <[email protected]> | |
114 | Guang Wang <[email protected]> | |
63a0eb69 | 115 | Haibin Zhang <[email protected]> |
1fed8f00 | 116 | Hailiang Zhang <[email protected]> |
b0c4798f | 117 | Hanna Reitz <[email protected]> <[email protected]> |
1fed8f00 | 118 | Hervé Poussineau <[email protected]> |
63a0eb69 | 119 | Hyman Huang <[email protected]> |
1fed8f00 PMD |
120 | Jakub Jermář <[email protected]> |
121 | Jakub Jermář <[email protected]> | |
122 | Jean-Christophe Dubois <[email protected]> | |
123 | Jindřich Makovička <[email protected]> | |
124 | John Arbuckle <[email protected]> | |
125 | Juha Riihimäki <[email protected]> | |
126 | Juha Riihimäki <[email protected]> | |
127 | Jun Li <[email protected]> | |
128 | Laurent Vivier <[email protected]> | |
129 | Leandro Lupori <[email protected]> | |
130 | Li Guang <[email protected]> | |
131 | Liming Wang <[email protected]> | |
132 | linzhecheng <[email protected]> | |
133 | Liran Schour <[email protected]> | |
134 | Liu Yu <[email protected]> | |
135 | Liu Yu <[email protected]> | |
136 | Li Zhang <[email protected]> | |
137 | Li Zhang <[email protected]> | |
138 | Lluís Vilanova <[email protected]> | |
139 | Lluís Vilanova <[email protected]> | |
140 | Longpeng (Mike) <[email protected]> | |
141 | Luc Michel <[email protected]> | |
142 | Luc Michel <[email protected]> | |
143 | Marc Marí <[email protected]> | |
144 | Marc Marí <[email protected]> | |
145 | Michael Avdienko <[email protected]> | |
146 | Michael S. Tsirkin <[email protected]> | |
147 | Munkyu Im <[email protected]> | |
148 | Nicholas Bellinger <[email protected]> | |
149 | Nicholas Thomas <[email protected]> | |
150 | Nikunj A Dadhania <[email protected]> | |
151 | Orit Wasserman <[email protected]> | |
152 | Paolo Bonzini <[email protected]> | |
63a0eb69 | 153 | Pan Nengyuan <[email protected]> |
1fed8f00 PMD |
154 | Pavel Dovgaluk <[email protected]> |
155 | Pavel Dovgaluk <[email protected]> | |
156 | Pavel Dovgaluk <[email protected]> | |
b8003f99 | 157 | Peter Chubb <[email protected]> |
1fed8f00 PMD |
158 | Peter Crosthwaite <[email protected]> |
159 | Peter Crosthwaite <[email protected]> | |
160 | Peter Crosthwaite <[email protected]> | |
161 | Prasad J Pandit <[email protected]> | |
162 | Prasad J Pandit <[email protected]> | |
163 | Qiao Nuohan <[email protected]> | |
957e8b34 | 164 | Reimar Döffinger <[email protected]> |
1fed8f00 PMD |
165 | Remy Noel <[email protected]> |
166 | Roger Pau Monné <[email protected]> | |
167 | Shin'ichiro Kawasaki <[email protected]> | |
168 | Shin'ichiro Kawasaki <[email protected]> | |
169 | Sochin Jiang <[email protected]> | |
98d3a724 | 170 | Stefan Berger <[email protected]> <[email protected]> |
1fed8f00 PMD |
171 | Takashi Yoshii <[email protected]> |
172 | Thomas Huth <[email protected]> | |
173 | Thomas Knych <[email protected]> | |
174 | Timothy Baldwin <[email protected]> | |
175 | Tony Nguyen <[email protected]> | |
176 | Venkateswararao Jujjuri <[email protected]> | |
177 | Vibi Sreenivasan <[email protected]> | |
178 | Vijaya Kumar K <[email protected]> | |
179 | Vijaya Kumar K <[email protected]> | |
180 | Vijay Kumar <[email protected]> | |
181 | Vijay Kumar <[email protected]> | |
182 | Wang Guang <[email protected]> | |
183 | Wenchao Xia <[email protected]> | |
184 | Wenshuang Ma <[email protected]> | |
185 | Xiaoqiang Zhao <[email protected]> | |
186 | Xinhua Cao <[email protected]> | |
187 | Xiong Zhang <[email protected]> | |
188 | Yin Yin <[email protected]> | |
4065bb25 YCL |
189 | Yu-Chen Lin <[email protected]> |
190 | Yu-Chen Lin <[email protected]> <[email protected]> | |
1fed8f00 PMD |
191 | YunQiang Su <[email protected]> |
192 | YunQiang Su <[email protected]> | |
193 | Yuri Pudgorodskiy <[email protected]> | |
194 | Zhengui Li <[email protected]> | |
195 | Zhenwei Pi <[email protected]> | |
196 | Zhenwei Pi <[email protected]> | |
197 | Zhuang Yanying <[email protected]> |