Merge pull request #70036 from hamishknight/mailing-list

hamishknight · web-flow · commit 8ff0e3e7753c · 2023-11-27T11:38:51.000Z
diff --git a/.mailmap b/.mailmap
@@ -59,7 +59,8 @@ Graydon Hoare <ghoare@apple.com> <graydon@users.noreply.github.com>
 Greg Parker <gparker@apple.com> <gparker-github@sealiesoftware.com>
 Greg Titus <gregomni@gmail.com>
 Guillaume Lessard <dhtnstff@gmail.com> <glessard@users.noreply.github.com>
-Hamish <hamish2knight@gmail.com>
+Hamish Knight <hamish_knight@apple.com> <hamish2knight@gmail.com>
+Hamish Knight <hamish_knight@apple.com> <hamish_github@mediocremail.com>
 Han Sangjin <tinysun@jssolution.co.kr> <tinysun.net@gmail.com>
 Harlan Haskins <harlan@apple.com> <harlan@harlanhaskins.com>
 Harlan Haskins <harlan@apple.com> <hbh@google.com>

-Original file line number
+Diff line change
 Greg Parker <[email protected]> <[email protected]>
 Greg Titus <[email protected]>
 Guillaume Lessard <[email protected]> <[email protected]>
 -Hamish <[email protected]>
 +Hamish Knight <[email protected]> <[email protected]>
 +Hamish Knight <[email protected]> <[email protected]>
 Han Sangjin <[email protected]> <[email protected]>
 Harlan Haskins <[email protected]> <[email protected]>
 Harlan Haskins <[email protected]> <[email protected]>