mirror of
https://github.com/zed-industries/zed.git
synced 2024-11-07 20:39:04 +03:00
dd67bda595
This PR updates the `.mailmap` file to merge some commit authors using multiple emails. Release Notes: - N/A
60 lines
2.7 KiB
Plaintext
60 lines
2.7 KiB
Plaintext
# Canonical author names and emails.
|
|
#
|
|
# Use this to provide a canonical name and email for an author when their
|
|
# name is not always written the same way and/or they have commits authored
|
|
# under different email addresses.
|
|
#
|
|
# Reference: https://git-scm.com/docs/gitmailmap
|
|
|
|
# Keep these entries sorted alphabetically.
|
|
# In Zed: `editor: sort lines case sensitive`
|
|
|
|
Antonio Scandurra <me@as-cii.com>
|
|
Antonio Scandurra <me@as-cii.com> <antonio@zed.dev>
|
|
Christian Bergschneider <christian.bergschneider@gmx.de>
|
|
Christian Bergschneider <christian.bergschneider@gmx.de> <magiclake@gmx.de>
|
|
Conrad Irwin <conrad@zed.dev>
|
|
Conrad Irwin <conrad@zed.dev> <conrad.irwin@gmail.com>
|
|
Fernando Tagawa <tagawafernando@gmail.com>
|
|
Fernando Tagawa <tagawafernando@gmail.com> <fernando.tagawa.gamail.com@gmail.com>
|
|
Greg Morenz <greg-morenz@droid.cafe>
|
|
Greg Morenz <greg-morenz@droid.cafe> <morenzg@gmail.com>
|
|
Ivan Žužak <izuzak@gmail.com>
|
|
Ivan Žužak <izuzak@gmail.com> <ivan.zuzak@github.com>
|
|
Joseph T. Lyons <JosephTLyons@gmail.com>
|
|
Joseph T. Lyons <JosephTLyons@gmail.com> <JosephTLyons@users.noreply.github.com>
|
|
Julia <floc@unpromptedtirade.com>
|
|
Julia <floc@unpromptedtirade.com> <30666851+ForLoveOfCats@users.noreply.github.com>
|
|
Kaylee Simmons <kay@the-simmons.net>
|
|
Kaylee Simmons <kay@the-simmons.net> <kay@zed.dev>
|
|
Kaylee Simmons <kay@the-simmons.net> <keith@the-simmons.net>
|
|
Kaylee Simmons <kay@the-simmons.net> <keith@zed.dev>
|
|
Kirill Bulatov <kirill@zed.dev>
|
|
Kirill Bulatov <kirill@zed.dev> <mail4score@gmail.com>
|
|
Kyle Caverly <kylebcaverly@gmail.com>
|
|
Kyle Caverly <kylebcaverly@gmail.com> <kyle@zed.dev>
|
|
LoganDark <contact@logandark.mozmail.com>
|
|
LoganDark <contact@logandark.mozmail.com> <git@logandark.mozmail.com>
|
|
LoganDark <contact@logandark.mozmail.com> <github@logandark.mozmail.com>
|
|
Marshall Bowers <elliott.codes@gmail.com>
|
|
Marshall Bowers <elliott.codes@gmail.com> <marshall@zed.dev>
|
|
Max Brunsfeld <maxbrunsfeld@gmail.com>
|
|
Max Brunsfeld <maxbrunsfeld@gmail.com> <max@zed.dev>
|
|
Mikayla Maki <mikayla@zed.dev>
|
|
Mikayla Maki <mikayla@zed.dev> <mikayla.c.maki@gmail.com>
|
|
Mikayla Maki <mikayla@zed.dev> <mikayla.c.maki@icloud.com>
|
|
Nate Butler <iamnbutler@gmail.com>
|
|
Nate Butler <iamnbutler@gmail.com> <nate@zed.dev>
|
|
Nathan Sobo <nathan@zed.dev>
|
|
Nathan Sobo <nathan@zed.dev> <nathan@warp.dev>
|
|
Nathan Sobo <nathan@zed.dev> <nathansobo@gmail.com>
|
|
Petros Amoiridis <petros@hey.com>
|
|
Petros Amoiridis <petros@hey.com> <petros@zed.dev>
|
|
Piotr Osiewicz <piotr@zed.dev>
|
|
Piotr Osiewicz <piotr@zed.dev> <24362066+osiewicz@users.noreply.github.com>
|
|
Robert Clover <git@clo4.net>
|
|
Robert Clover <git@clo4.net> <robert@clover.gdn>
|
|
Thorsten Ball <thorsten@zed.dev>
|
|
Thorsten Ball <thorsten@zed.dev> <me@thorstenball.com>
|
|
Thorsten Ball <thorsten@zed.dev> <mrnugget@gmail.com>
|