Skip to content

Commit d98a165

Browse files
committed
Auto merge of #60565 - Mark-Simulacrum:mailmap-fixes, r=pietroalbini
Update mailmap to proper syntax Also updates my entry to the proper name
2 parents 7ac0200 + 91e0c25 commit d98a165

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

.mailmap

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ Chris C Cerami <chrisccerami@users.noreply.github.com> Chris C Cerami <chrisccer
5353
Chris Pressey <cpressey@gmail.com>
5454
Chris Thorn <chris@thorn.co> Chris Thorn <thorn@thoughtbot.com>
5555
Chris Vittal <christopher.vittal@gmail.com> Christopher Vittal <christopher.vittal@gmail.com>
56-
Christian Poveda <christianpoveda@protonmail.com> <z1mvader@protonmail.com> <cn.poveda.ruiz@gmail.com>
56+
Christian Poveda <christianpoveda@protonmail.com> <z1mvader@protonmail.com>
57+
Christian Poveda <christianpoveda@protonmail.com> <cn.poveda.ruiz@gmail.com>
5758
Clark Gaebel <cg.wowus.cg@gmail.com> <cgaebel@mozilla.com>
5859
Clinton Ryan <clint.ryan3@gmail.com>
5960
Corey Richardson <corey@octayn.net> Elaine "See More" Nemo <corey@octayn.net>
@@ -79,7 +80,9 @@ Eric Holk <eric.holk@gmail.com> <eholk@mozilla.com>
7980
Eric Holmes <eric@ejholmes.net>
8081
Eric Reed <ecreed@cs.washington.edu> <ereed@mozilla.com>
8182
Erick Tryzelaar <erick.tryzelaar@gmail.com> <etryzelaar@iqt.org>
82-
Esteban Küber <esteban@kuber.com.ar> <estebank@users.noreply.github.com> <esteban@commure.com> <github@kuber.com.ar>
83+
Esteban Küber <esteban@kuber.com.ar> <estebank@users.noreply.github.com>
84+
Esteban Küber <esteban@kuber.com.ar> <esteban@commure.com>
85+
Esteban Küber <esteban@kuber.com.ar> <github@kuber.com.ar>
8386
Evgeny Sologubov
8487
Falco Hirschenberger <falco.hirschenberger@gmail.com> <hirschen@itwm.fhg.de>
8588
Felix S. Klock II <pnkfelix@pnkfx.org> Felix S Klock II <pnkfelix@pnkfx.org>
@@ -146,7 +149,7 @@ NAKASHIMA, Makoto <makoto.nksm+github@gmail.com> <makoto.nksm@gmail.com>
146149
NAKASHIMA, Makoto <makoto.nksm+github@gmail.com> <makoto.nksm+github@gmail.com>
147150
Marcell Pardavi <marcell.pardavi@gmail.com>
148151
Margaret Meyerhofer <mmeyerho@andrew.cmu.edu> <mmeyerho@andrew>
149-
Mark Simulacrum <mark.simulacrum@gmail.com>
152+
Mark Rousskov <mark.simulacrum@gmail.com>
150153
Mark Sinclair <mark.edward.x@gmail.com>
151154
Mark Sinclair <mark.edward.x@gmail.com> =Mark Sinclair <=125axel125@gmail.com>
152155
Markus Westerlind <marwes91@gmail.com> Markus <marwes91@gmail.com>
@@ -226,7 +229,7 @@ Tim Joseph Dumol <tim@timdumol.com>
226229
Torsten Weber <TorstenWeber12@gmail.com> <torstenweber12@gmail.com>
227230
Ty Overby <ty@pre-alpha.com>
228231
Ulrik Sverdrup <bluss@users.noreply.github.com> bluss <bluss>
229-
Ulrik Sverdrup <bluss@users.noreply.github.com> bluss <bluss@users.noreply.github.com> bluss <bluss>
232+
Ulrik Sverdrup <bluss@users.noreply.github.com> bluss <bluss@users.noreply.github.com>
230233
Ulrik Sverdrup <bluss@users.noreply.github.com> Ulrik Sverdrup <root@localhost>
231234
Vadim Petrochenkov <vadim.petrochenkov@gmail.com>
232235
Vadim Petrochenkov <vadim.petrochenkov@gmail.com> petrochenkov <vadim.petrochenkov@gmail.com>

0 commit comments

Comments
 (0)