]>
Commit | Line | Data |
---|---|---|
dc1d3303 RN |
1 | # This file maps the name+email seen in a commit back to a canonical |
2 | # name+email. Git will replace the commit name/email with the canonical version | |
3 | # wherever it sees it. | |
4 | # | |
5 | # If there is a commit in the history with a "wrong" name or email, list it | |
6 | # here. If you regularly commit with an alternate name or email address and | |
7 | # would like to ensure that you are always listed consistently in the repo, add | |
8 | # mapping here. | |
9 | # | |
10 | # On the other hand, if you use multiple names or email addresses legitimately | |
11 | # (eg you use a company email address for your paid OpenZFS work, and a | |
12 | # personal address for your evening side projects), then don't map one to the | |
13 | # other here. | |
14 | # | |
15 | # The most common formats are: | |
16 | # | |
17 | # Canonical Name <canonical-email> | |
18 | # Canonical Name <canonical-email> <commit-email> | |
19 | # Canonical Name <canonical-email> Commit Name <commit-email> | |
20 | # | |
21 | # See https://git-scm.com/docs/gitmailmap for more info. | |
22 | ||
23 | # These maps are making names consistent where they have varied but the email | |
24 | # address has never changed. In most cases, the full name is in the | |
25 | # Signed-off-by of a commit with a matching author. | |
26 | Ahelenia Ziemiańska <nabijaczleweli@gmail.com> | |
27 | Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz> | |
28 | Alex John <alex@stty.io> | |
29 | Andreas Dilger <adilger@dilger.ca> | |
30 | Andrew Walker <awalker@ixsystems.com> | |
31 | Benedikt Neuffer <github@itfriend.de> | |
32 | Chengfei Zhu <chengfeix.zhu@intel.com> | |
33 | Chris Lindee <chris.lindee+github@gmail.com> | |
34 | Colm Buckley <colm@tuatha.org> | |
35 | Crag Wang <crag0715@gmail.com> | |
36 | Damian Szuberski <szuberskidamian@gmail.com> | |
37 | Daniel Kolesa <daniel@octaforge.org> | |
38 | Debabrata Banerjee <dbavatar@gmail.com> | |
39 | Finix Yan <yanchongwen@hotmail.com> | |
40 | Gaurav Kumar <gauravk.18@gmail.com> | |
41 | Gionatan Danti <g.danti@assyoma.it> | |
42 | Glenn Washburn <development@efficientek.com> | |
43 | Gordan Bobic <gordan.bobic@gmail.com> | |
44 | Gregory Bartholomew <gregory.lee.bartholomew@gmail.com> | |
45 | hedong zhang <h_d_zhang@163.com> | |
46 | InsanePrawn <Insane.Prawny@gmail.com> | |
47 | Jason Cohen <jwittlincohen@gmail.com> | |
48 | Jason Harmening <jason.harmening@gmail.com> | |
49 | Jeremy Faulkner <gldisater@gmail.com> | |
50 | Jinshan Xiong <jinshan.xiong@gmail.com> | |
51 | John Poduska <jpoduska@datto.com> | |
52 | Justin Scholz <git@justinscholz.de> | |
53 | Ka Ho Ng <khng300@gmail.com> | |
54 | Kash Pande <github@tripleback.net> | |
55 | Kay Pedersen <christianpe96@gmail.com> | |
56 | KernelOfTruth <kerneloftruth@gmail.com> | |
57 | Liu Hua <liu.hua130@zte.com.cn> | |
58 | Liu Qing <winglq@gmail.com> | |
59 | loli10K <ezomori.nozomu@gmail.com> | |
60 | Matthias Blankertz <matthias@blankertz.org> | |
61 | Michael Gmelin <grembo@FreeBSD.org> | |
62 | Olivier Mazouffre <olivier.mazouffre@ims-bordeaux.fr> | |
63 | Piotr Kubaj <pkubaj@anongoth.pl> | |
64 | Quentin Zdanis <zdanisq@gmail.com> | |
65 | Roberto Ricci <ricci@disroot.org> | |
66 | Rob Norris <robn@despairlabs.com> | |
67 | Rob Norris <rob.norris@klarasystems.com> | |
68 | Sam Lunt <samuel.j.lunt@gmail.com> | |
69 | Sanjeev Bagewadi <sanjeev.bagewadi@gmail.com> | |
70 | Stoiko Ivanov <github@nomore.at> | |
71 | Tamas TEVESZ <ice@extreme.hu> | |
72 | WHR <msl0000023508@gmail.com> | |
73 | Yanping Gao <yanping.gao@xtaotech.com> | |
74 | Youzhong Yang <youzhong@gmail.com> | |
75 | ||
76 | # Commits from strange places, long ago | |
77 | Brian Behlendorf <behlendorf1@llnl.gov> <behlendo@7e1ea52c-4ff2-0310-8f11-9dd32ca42a1c> | |
78 | Brian Behlendorf <behlendorf1@llnl.gov> <behlendo@fedora-17-amd64.(none)> | |
79 | Brian Behlendorf <behlendorf1@llnl.gov> <behlendo@myhost.(none)> | |
80 | Brian Behlendorf <behlendorf1@llnl.gov> <ubuntu@ip-172-31-16-145.us-west-1.compute.internal> | |
81 | Brian Behlendorf <behlendorf1@llnl.gov> <ubuntu@ip-172-31-20-6.us-west-1.compute.internal> | |
82 | Herb Wartens <wartens2@llnl.gov> <wartens2@7e1ea52c-4ff2-0310-8f11-9dd32ca42a1c> | |
83 | Ned Bass <bass6@llnl.gov> <bass6@zeno1.(none)> | |
84 | Tulsi Jain <tulsi.jain@delphix.com> <tulsi.jain@Tulsi-Jains-MacBook-Pro.local> | |
85 | ||
86 | # Mappings from Github no-reply addresses | |
87 | ajs124 <git@ajs124.de> <ajs124@users.noreply.github.com> | |
88 | Alek Pinchuk <apinchuk@axcient.com> <alek-p@users.noreply.github.com> | |
89 | Alexander Lobakin <alobakin@pm.me> <solbjorn@users.noreply.github.com> | |
90 | Alexey Smirnoff <fling@member.fsf.org> <fling-@users.noreply.github.com> | |
91 | Allen Holl <allen.m.holl@gmail.com> <65494904+allen-4@users.noreply.github.com> | |
92 | Ameer Hamza <ahamza@ixsystems.com> <106930537+ixhamza@users.noreply.github.com> | |
93 | Andrew J. Hesford <ajh@sideband.org> <48421688+ahesford@users.noreply.github.com>> | |
94 | Andrew Sun <me@andrewsun.com> <as-com@users.noreply.github.com> | |
95 | Aron Xu <happyaron.xu@gmail.com> <happyaron@users.noreply.github.com> | |
96 | Arun KV <arun.kv@datacore.com> <65647132+arun-kv@users.noreply.github.com> | |
97 | Ben Wolsieffer <benwolsieffer@gmail.com> <lopsided98@users.noreply.github.com> | |
98 | bernie1995 <bernie.pikes@gmail.com> <42413912+bernie1995@users.noreply.github.com> | |
99 | Boris Protopopov <boris.protopopov@actifio.com> <bprotopopov@users.noreply.github.com> | |
100 | Brad Forschinger <github@bnjf.id.au> <bnjf@users.noreply.github.com> | |
101 | Brandon Thetford <brandon@dodecatec.com> <dodexahedron@users.noreply.github.com> | |
102 | buzzingwires <buzzingwires@outlook.com> <131118055+buzzingwires@users.noreply.github.com> | |
103 | Cedric Maunoury <cedric.maunoury@gmail.com> <38213715+cedricmaunoury@users.noreply.github.com> | |
104 | Charles Suh <charles.suh@gmail.com> <charlessuh@users.noreply.github.com> | |
105 | Dacian Reece-Stremtan <dacianstremtan@gmail.com> <35844628+dacianstremtan@users.noreply.github.com> | |
106 | Damian Szuberski <szuberskidamian@gmail.com> <30863496+szubersk@users.noreply.github.com> | |
107 | Daniel Hiepler <d-git@coderdu.de> <32984777+heeplr@users.noreply.github.com> | |
108 | Daniel Kobras <d.kobras@science-computing.de> <sckobras@users.noreply.github.com> | |
109 | Daniel Reichelt <hacking@nachtgeist.net> <nachtgeist@users.noreply.github.com> | |
110 | David Quigley <david.quigley@intel.com> <dpquigl@users.noreply.github.com> | |
111 | DHE <git@dehacked.net> <DeHackEd@users.noreply.github.com> | |
112 | Dmitri John Ledkov <dimitri.ledkov@canonical.com> <19779+xnox@users.noreply.github.com> | |
113 | Dries Michiels <driesm.michiels@gmail.com> <32487486+driesmp@users.noreply.github.com> | |
114 | Edmund Nadolski <edmund.nadolski@ixsystems.com> <137826107+ednadolski-ix@users.noreply.github.com> | |
115 | Érico Nogueira <erico.erc@gmail.com> <34201958+ericonr@users.noreply.github.com> | |
116 | Fedor Uporov <fuporov.vstack@gmail.com> <60701163+fuporovvStack@users.noreply.github.com> | |
117 | Felix Dörre <felix@dogcraft.de> <felixdoerre@users.noreply.github.com> | |
118 | Felix Neumärker <xdch47@posteo.de> <34678034+xdch47@users.noreply.github.com> | |
119 | Finix Yan <yancw@info2soft.com> <Finix1979@users.noreply.github.com> | |
120 | Gaurav Kumar <gauravk.18@gmail.com> <gaurkuma@users.noreply.github.com> | |
121 | George Gaydarov <git@gg7.io> <gg7@users.noreply.github.com> | |
122 | Georgy Yakovlev <gyakovlev@gentoo.org> <168902+gyakovlev@users.noreply.github.com> | |
123 | Gerardwx <gerardw@alum.mit.edu> <Gerardwx@users.noreply.github.com> | |
124 | Gian-Carlo DeFazio <defazio1@llnl.gov> <defaziogiancarlo@users.noreply.github.com> | |
125 | Giuseppe Di Natale <dinatale2@llnl.gov> <dinatale2@users.noreply.github.com> | |
126 | Hajo Möller <dasjoe@gmail.com> <dasjoe@users.noreply.github.com> | |
127 | Harry Mallon <hjmallon@gmail.com> <1816667+hjmallon@users.noreply.github.com> | |
128 | Hiếu Lê <leorize+oss@disroot.org> <alaviss@users.noreply.github.com> | |
129 | Jake Howard <git@theorangeone.net> <RealOrangeOne@users.noreply.github.com> | |
130 | James Cowgill <james.cowgill@mips.com> <jcowgill@users.noreply.github.com> | |
131 | Jason King <jason.king@joyent.com> <jasonbking@users.noreply.github.com> | |
132 | Jeff Dike <jdike@akamai.com> <52420226+jdike@users.noreply.github.com> | |
133 | Jitendra Patidar <jitendra.patidar@nutanix.com> <53164267+jsai20@users.noreply.github.com> | |
134 | João Carlos Mendes Luís <jonny@jonny.eng.br> <dioni21@users.noreply.github.com> | |
135 | John Eismeier <john.eismeier@gmail.com> <32205350+jeis2497052@users.noreply.github.com> | |
136 | John L. Hammond <john.hammond@intel.com> <35266395+jhammond-intel@users.noreply.github.com> | |
137 | John-Mark Gurney <jmg@funkthat.com> <jmgurney@users.noreply.github.com> | |
138 | John Ramsden <johnramsden@riseup.net> <johnramsden@users.noreply.github.com> | |
139 | Jonathon Fernyhough <jonathon@m2x.dev> <559369+jonathonf@users.noreply.github.com> | |
140 | Justin Hibbits <chmeeedalf@gmail.com> <chmeeedalf@users.noreply.github.com> | |
141 | Kevin Jin <lostking2008@hotmail.com> <33590050+jxdking@users.noreply.github.com> | |
142 | Kevin P. Fleming <kevin@km6g.us> <kpfleming@users.noreply.github.com> | |
143 | Krzysztof Piecuch <piecuch@kpiecuch.pl> <3964215+pikrzysztof@users.noreply.github.com> | |
144 | Kyle Evans <kevans@FreeBSD.org> <kevans91@users.noreply.github.com> | |
145 | Laurențiu Nicola <lnicola@dend.ro> <lnicola@users.noreply.github.com> | |
146 | loli10K <ezomori.nozomu@gmail.com> <loli10K@users.noreply.github.com> | |
147 | Lorenz Hüdepohl <dev@stellardeath.org> <lhuedepohl@users.noreply.github.com> | |
148 | Luís Henriques <henrix@camandro.org> <73643340+lumigch@users.noreply.github.com> | |
149 | Marcin Skarbek <git@skarbek.name> <mskarbek@users.noreply.github.com> | |
150 | Matt Fiddaman <github@m.fiddaman.uk> <81489167+matt-fidd@users.noreply.github.com> | |
151 | Max Zettlmeißl <max@zettlmeissl.de> <6818198+maxz@users.noreply.github.com> | |
152 | Michael Niewöhner <foss@mniewoehner.de> <c0d3z3r0@users.noreply.github.com> | |
153 | Michael Zhivich <mzhivich@akamai.com> <33133421+mzhivich@users.noreply.github.com> | |
154 | Mo Zhou <cdluminate@gmail.com> <5723047+cdluminate@users.noreply.github.com> | |
155 | Nick Mattis <nickm970@gmail.com> <nmattis@users.noreply.github.com> | |
156 | omni <omni+vagant@hack.org> <79493359+omnivagant@users.noreply.github.com> | |
157 | Pablo Correa Gómez <ablocorrea@hotmail.com> <32678034+pablofsf@users.noreply.github.com> | |
158 | Paul Zuchowski <pzuchowski@datto.com> <31706010+PaulZ-98@users.noreply.github.com> | |
159 | Peter Ashford <ashford@accs.com> <pashford@users.noreply.github.com> | |
160 | Peter Dave Hello <hsu@peterdavehello.org> <PeterDaveHello@users.noreply.github.com> | |
161 | Peter Wirdemo <peter.wirdemo@gmail.com> <4224155+pewo@users.noreply.github.com> | |
162 | Petros Koutoupis <petros@petroskoutoupis.com> <pkoutoupis@users.noreply.github.com> | |
163 | Ping Huang <huangping@smartx.com> <101400146+hpingfs@users.noreply.github.com> | |
164 | Piotr P. Stefaniak <pstef@freebsd.org> <pstef@users.noreply.github.com> | |
165 | Richard Allen <belperite@gmail.com> <33836503+belperite@users.noreply.github.com> | |
166 | Rich Ercolani <rincebrain@gmail.com> <214141+rincebrain@users.noreply.github.com> | |
167 | Rob Wing <rob.wing@klarasystems.com> <98866084+rob-wing@users.noreply.github.com> | |
168 | Roman Strashkin <roman.strashkin@nexenta.com> <Ramzec@users.noreply.github.com> | |
169 | Ryan Hirasaki <ryanhirasaki@gmail.com> <4690732+RyanHir@users.noreply.github.com> | |
170 | Samuel Wycliffe J <samwyc@hpe.com> <115969550+samwyc@users.noreply.github.com> | |
171 | Samuel Wycliffe <samuelwycliffe@gmail.com> <50765275+npc203@users.noreply.github.com> | |
172 | Savyasachee Jha <hi@savyasacheejha.com> <savyajha@users.noreply.github.com> | |
173 | Scott Colby <scott@scolby.com> <scolby33@users.noreply.github.com> | |
174 | Sean Eric Fagan <kithrup@mac.com> <kithrup@users.noreply.github.com> | |
175 | Spencer Kinny <spencerkinny1995@gmail.com> <30333052+Spencer-Kinny@users.noreply.github.com> | |
176 | Srikanth N S <srikanth.nagasubbaraoseetharaman@hpe.com> <75025422+nssrikanth@users.noreply.github.com> | |
177 | Thomas Geppert <geppi@digitx.de> <geppi@users.noreply.github.com> | |
178 | Tim Crawford <tcrawford@datto.com> <crawfxrd@users.noreply.github.com> | |
179 | Tom Matthews <tom@axiom-partners.com> <tomtastic@users.noreply.github.com> | |
180 | Tony Perkins <tperkins@datto.com> <62951051+tony-zfs@users.noreply.github.com> | |
181 | Torsten Wörtwein <twoertwein@gmail.com> <twoertwein@users.noreply.github.com> | |
182 | Tulsi Jain <tulsi.jain@delphix.com> <TulsiJain@users.noreply.github.com> | |
183 | Václav Skála <skala@vshosting.cz> <33496485+vaclavskala@users.noreply.github.com> | |
184 | Violet Purcell <vimproved@inventati.org> <66446404+vimproved@users.noreply.github.com> | |
185 | Vipin Kumar Verma <vipin.verma@hpe.com> <75025470+vermavipinkumar@users.noreply.github.com> | |
186 | Wolfgang Bumiller <w.bumiller@proxmox.com> <Blub@users.noreply.github.com> | |
187 | xtouqh <xtouqh@hotmail.com> <72357159+xtouqh@users.noreply.github.com> | |
188 | Yuri Pankov <yuripv@FreeBSD.org> <113725409+yuripv@users.noreply.github.com> | |
189 | Yuri Pankov <yuripv@FreeBSD.org> <82001006+yuripv@users.noreply.github.com> |