From 7c57ffafbd46389a8306b94bde08dcc9784d60c9 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Fri, 30 Aug 2024 17:34:05 -0400
Subject: [PATCH] Update `.mailmap` (#17182)

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

Release Notes:

- N/A
---
 .mailmap   | 21 +++++++++++++++++++--
 typos.toml |  4 ++++
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/.mailmap b/.mailmap
index d649a5756f..35f601acfb 100644
--- a/.mailmap
+++ b/.mailmap
@@ -11,8 +11,12 @@
 
 Alex Viscreanu <alexviscreanu@gmail.com>
 Alex Viscreanu <alexviscreanu@gmail.com> <alexandru.viscreanu@kiwi.com>
+Alexander Mankuta <alex@pointless.one>
+Alexander Mankuta <alex@pointless.one> <alex+github@pointless.one>
 amtoaer <amtoaer@gmail.com>
 amtoaer <amtoaer@gmail.com> <amtoaer@outlook.com>
+Andrei Zvonimir Crnković <andrei@0x7f.dev>
+Andrei Zvonimir Crnković <andrei@0x7f.dev> <andreicek@0x7f.dev>
 Antonio Scandurra <me@as-cii.com>
 Antonio Scandurra <me@as-cii.com> <antonio@zed.dev>
 Bennet Bo Fenner <bennet@zed.dev>
@@ -24,8 +28,9 @@ Conrad Irwin <conrad@zed.dev>
 Conrad Irwin <conrad@zed.dev> <conrad.irwin@gmail.com>
 Danilo Leal <danilo@zed.dev>
 Danilo Leal <danilo@zed.dev> <67129314+danilo-leal@users.noreply.github.com>
-Evren Sen <146845123+evrensen467@users.noreply.github.com>
-Evren Sen <146845123+evrensen467@users.noreply.github.com> <146845123+evrsen@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>
 Greg Morenz <greg-morenz@droid.cafe>
@@ -49,8 +54,12 @@ 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>
+Matt Fellenz <matt@felle.nz>
+Matt Fellenz <matt@felle.nz> <matt+github@felle.nz>
 Max Brunsfeld <maxbrunsfeld@gmail.com>
 Max Brunsfeld <maxbrunsfeld@gmail.com> <max@zed.dev>
+Max Linke <maxlinke88@gmail.com>
+Max Linke <maxlinke88@gmail.com> <kain88-de@users.noreply.github.com>
 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>
@@ -75,10 +84,18 @@ Richard Feldman <oss@rtfeldman.com>
 Richard Feldman <oss@rtfeldman.com> <richard@zed.dev>
 Robert Clover <git@clo4.net>
 Robert Clover <git@clo4.net> <robert@clover.gdn>
+Roy Williams <roy.williams.iii@gmail.com>
+Roy Williams <roy.williams.iii@gmail.com> <roy@anthropic.com>
 Sergey Onufrienko <sergey@onufrienko.com>
+Thorben Kröger <dev@thorben.net>
+Thorben Kröger <dev@thorben.net> <thorben.kroeger@hexagon.com>
 Thorsten Ball <thorsten@zed.dev>
 Thorsten Ball <thorsten@zed.dev> <me@thorstenball.com>
 Thorsten Ball <thorsten@zed.dev> <mrnugget@gmail.com>
+Tristan Hume <tris.hume@gmail.com>
+Tristan Hume <tris.hume@gmail.com> <tristan@anthropic.com>
+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>
 WindSoilder <WindSoilder@outlook.com>
diff --git a/typos.toml b/typos.toml
index 116a599ab5..ad18f890e5 100644
--- a/typos.toml
+++ b/typos.toml
@@ -3,6 +3,10 @@ ignore-files = true
 ignore-hidden = false
 extend-exclude = [
     ".git/",
+
+    # Contributor names aren't typos.
+    ".mailmap",
+
     # File suffixes aren't typos
     "assets/icons/file_icons/file_types.json",
     "crates/extensions_ui/src/extension_suggest.rs",