From e427c0dc5a9d0758719a66240f895b2559374b5f Mon Sep 17 00:00:00 2001
From: Casey Carter <cacarter@microsoft.com>
Date: Fri, 25 Oct 2024 13:13:13 -0700
Subject: [PATCH 1/3] Add `.mailmap` file

Git will use this file to determine a canonical name and email address for each committer and/or author email address to display in the output of `git log` and `git blame`. This is useful when people change names or emails or if someone wants to map their different accounts to a single canonical set of info.

See https://git-scm.com/docs/gitmailmap for details.
---
 .mailmap | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 .mailmap

diff --git a/.mailmap b/.mailmap
new file mode 100644
index 00000000000..1f77f5ee4b6
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,10 @@
+# Copyright (c) Microsoft Corporation.
+# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+
+# This file maps author and committer email addresses to canonical names and email
+# addresses for display in the output of `git log` and `git blame`.
+# Format:
+# Canonical Name <canonical@address.dns> <actual@address.dns>
+
+Amy Wishnousky <amyw@microsoft.com> <stwish@microsoft.com>
+Anju del Moral Gonzalez <delMoralGonzalez.Anju@microsoft.com> <judelmor@microsoft.com>

From d195488a747862ebdb48b5b8de4eba6d5243eba9 Mon Sep 17 00:00:00 2001
From: Casey Carter <cartec69@gmail.com>
Date: Fri, 25 Oct 2024 13:47:07 -0700
Subject: [PATCH 2/3] Use a more canonical exemplar server name

---
 .mailmap | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index 1f77f5ee4b6..80dd24c2f18 100644
--- a/.mailmap
+++ b/.mailmap
@@ -4,7 +4,7 @@
 # This file maps author and committer email addresses to canonical names and email
 # addresses for display in the output of `git log` and `git blame`.
 # Format:
-# Canonical Name <canonical@address.dns> <actual@address.dns>
+# Canonical Name <canonical@example.com> <actual@example.com>
 
 Amy Wishnousky <amyw@microsoft.com> <stwish@microsoft.com>
 Anju del Moral Gonzalez <delMoralGonzalez.Anju@microsoft.com> <judelmor@microsoft.com>

From afbe078aac30b3c252efc317ae33808108f37a5c Mon Sep 17 00:00:00 2001
From: Casey Carter <cartec69@gmail.com>
Date: Fri, 25 Oct 2024 13:50:17 -0700
Subject: [PATCH 3/3] More "actual address" tweaks

---
 .mailmap | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index 80dd24c2f18..dd26e091b9b 100644
--- a/.mailmap
+++ b/.mailmap
@@ -4,7 +4,8 @@
 # This file maps author and committer email addresses to canonical names and email
 # addresses for display in the output of `git log` and `git blame`.
 # Format:
-# Canonical Name <canonical@example.com> <actual@example.com>
+# Canonical Name <canonical@example.com> <commit@example.com>
+
 
 Amy Wishnousky <amyw@microsoft.com> <stwish@microsoft.com>
 Anju del Moral Gonzalez <delMoralGonzalez.Anju@microsoft.com> <judelmor@microsoft.com>