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