From 328239898789aded2ce9a015ca57fb75d9a3d8c1 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Mon, 20 Jan 2025 11:32:34 -0500
Subject: [PATCH] Update `.mailmap` (#23366)

This PR updates the `.mailmap` file to merge some more commit authors.

Release Notes:

- N/A
---
 .mailmap | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/.mailmap b/.mailmap
index 75bdba644a..77736f0445 100644
--- a/.mailmap
+++ b/.mailmap
@@ -9,6 +9,8 @@
 # Keep these entries sorted alphabetically.
 # In Zed: `editor: sort lines case insensitive`
 
+Agus Zubiaga <agus@zed.dev>
+Agus Zubiaga <agus@zed.dev> <hi@aguz.me>
 Alex Viscreanu <alexviscreanu@gmail.com>
 Alex Viscreanu <alexviscreanu@gmail.com> <alexandru.viscreanu@kiwi.com>
 Alexander Mankuta <alex@pointless.one>
@@ -24,6 +26,7 @@ Bennet Bo Fenner <bennet@zed.dev> <53836821+bennetbo@users.noreply.github.com>
 Bennet Bo Fenner <bennet@zed.dev> <bennetbo@gmx.de>
 Boris Cherny <boris@anthropic.com>
 Boris Cherny <boris@anthropic.com> <boris@performancejs.com>
+Brian Tan <brian.tan88@gmail.com>
 Chris Hayes <chris+git@hayes.software>
 Christian Bergschneider <christian.bergschneider@gmx.de>
 Christian Bergschneider <christian.bergschneider@gmx.de> <magiclake@gmx.de>
@@ -32,11 +35,16 @@ Conrad Irwin <conrad@zed.dev> <conrad.irwin@gmail.com>
 Dairon Medina <dairon.medina@gmail.com>
 Danilo Leal <danilo@zed.dev>
 Danilo Leal <danilo@zed.dev> <67129314+danilo-leal@users.noreply.github.com>
+Edwin Aronsson <75266237+4teapo@users.noreply.github.com>
 Evren Sen <nervenes@icloud.com>
 Evren Sen <nervenes@icloud.com> <146845123+evrensen467@users.noreply.github.com>
 Evren Sen <nervenes@icloud.com> <146845123+evrsen@users.noreply.github.com>
 Fernando Tagawa <tagawafernando@gmail.com>
 Fernando Tagawa <tagawafernando@gmail.com> <fernando.tagawa.gamail.com@gmail.com>
+Finn Evers <dev@bahn.sh>
+Finn Evers <dev@bahn.sh> <75036051+MrSubidubi@users.noreply.github.com>
+Finn Evers <dev@bahn.sh> <finn.evers@outlook.de>
+Gowtham K <73059450+dovakin0007@users.noreply.github.com>
 Greg Morenz <greg-morenz@droid.cafe>
 Greg Morenz <greg-morenz@droid.cafe> <morenzg@gmail.com>
 Ihnat Aŭtuška <autushka.ihnat@gmail.com>
@@ -54,11 +62,14 @@ 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>
+Lilith Iris <itslirissama@gmail.com>
+Lilith Iris <itslirissama@gmail.com> <83819417+Irilith@users.noreply.github.com>
 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>
+Marshall Bowers <git@maxdeviant.com>
+Marshall Bowers <git@maxdeviant.com> <elliott.codes@gmail.com>
+Marshall Bowers <git@maxdeviant.com> <marshall@zed.dev>
 Matt Fellenz <matt@felle.nz>
 Matt Fellenz <matt@felle.nz> <matt+github@felle.nz>
 Max Brunsfeld <maxbrunsfeld@gmail.com>
@@ -112,5 +123,7 @@ Uladzislau Kaminski <i@uladkaminski.com>
 Uladzislau Kaminski <i@uladkaminski.com> <uladzislau_kaminski@epam.com>
 Vitaly Slobodin <vitaliy.slobodin@gmail.com>
 Vitaly Slobodin <vitaliy.slobodin@gmail.com> <vitaly_slobodin@fastmail.com>
+Will Bradley <williambbradley@gmail.com>
+Will Bradley <williambbradley@gmail.com> <will@zed.dev>
 WindSoilder <WindSoilder@outlook.com>
 张小白 <364772080@qq.com>