History

Update `.mailmap` (#11633)

This PR updates the `.mailmap` file to merge some commit authors using multiple emails. Release Notes: - N/A

Marshall Bowers committed 2 years ago

Commit dd67bda1 parent 4762e521 file · +9 −0Browse files

Unified · Split

.mailmap+9−0
@@ -15,8 +15,12 @@ Christian Bergschneider <christian.bergschneider@gmx.de> · 14 unmodified lines
15Christian Bergschneider <christian.bergschneider@gmx.de> <magiclake@gmx.de>15Christian Bergschneider <christian.bergschneider@gmx.de> <magiclake@gmx.de>
16Conrad Irwin <conrad@zed.dev>16Conrad Irwin <conrad@zed.dev>
17Conrad Irwin <conrad@zed.dev> <conrad.irwin@gmail.com>17Conrad Irwin <conrad@zed.dev> <conrad.irwin@gmail.com>
18Fernando Tagawa <tagawafernando@gmail.com>
19Fernando Tagawa <tagawafernando@gmail.com> <fernando.tagawa.gamail.com@gmail.com>
18Greg Morenz <greg-morenz@droid.cafe>20Greg Morenz <greg-morenz@droid.cafe>
19Greg Morenz <greg-morenz@droid.cafe> <morenzg@gmail.com>21Greg Morenz <greg-morenz@droid.cafe> <morenzg@gmail.com>
22Ivan Žužak <izuzak@gmail.com>
23Ivan Žužak <izuzak@gmail.com> <ivan.zuzak@github.com>
20Joseph T. Lyons <JosephTLyons@gmail.com>24Joseph T. Lyons <JosephTLyons@gmail.com>
21Joseph T. Lyons <JosephTLyons@gmail.com> <JosephTLyons@users.noreply.github.com>25Joseph T. Lyons <JosephTLyons@gmail.com> <JosephTLyons@users.noreply.github.com>
22Julia <floc@unpromptedtirade.com>26Julia <floc@unpromptedtirade.com>
@@ -29,6 +33,9 @@ Kirill Bulatov <kirill@zed.dev> · 6 unmodified lines
29Kirill Bulatov <kirill@zed.dev> <mail4score@gmail.com>33Kirill Bulatov <kirill@zed.dev> <mail4score@gmail.com>
30Kyle Caverly <kylebcaverly@gmail.com>34Kyle Caverly <kylebcaverly@gmail.com>
31Kyle Caverly <kylebcaverly@gmail.com> <kyle@zed.dev>35Kyle Caverly <kylebcaverly@gmail.com> <kyle@zed.dev>
36LoganDark <contact@logandark.mozmail.com>
37LoganDark <contact@logandark.mozmail.com> <git@logandark.mozmail.com>
38LoganDark <contact@logandark.mozmail.com> <github@logandark.mozmail.com>
32Marshall Bowers <elliott.codes@gmail.com>39Marshall Bowers <elliott.codes@gmail.com>
33Marshall Bowers <elliott.codes@gmail.com> <marshall@zed.dev>40Marshall Bowers <elliott.codes@gmail.com> <marshall@zed.dev>
34Max Brunsfeld <maxbrunsfeld@gmail.com>41Max Brunsfeld <maxbrunsfeld@gmail.com>
@@ -41,6 +48,8 @@ Nate Butler <iamnbutler@gmail.com> <nate@zed.dev> · 6 unmodified lines
41Nathan Sobo <nathan@zed.dev>48Nathan Sobo <nathan@zed.dev>
42Nathan Sobo <nathan@zed.dev> <nathan@warp.dev>49Nathan Sobo <nathan@zed.dev> <nathan@warp.dev>
43Nathan Sobo <nathan@zed.dev> <nathansobo@gmail.com>50Nathan Sobo <nathan@zed.dev> <nathansobo@gmail.com>
51Petros Amoiridis <petros@hey.com>
52Petros Amoiridis <petros@hey.com> <petros@zed.dev>
44Piotr Osiewicz <piotr@zed.dev>53Piotr Osiewicz <piotr@zed.dev>
45Piotr Osiewicz <piotr@zed.dev> <24362066+osiewicz@users.noreply.github.com>54Piotr Osiewicz <piotr@zed.dev> <24362066+osiewicz@users.noreply.github.com>
46Robert Clover <git@clo4.net>55Robert Clover <git@clo4.net>