summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorEmily Shaffer <nasamuffin@google.com>2023-04-07 14:22:49 -0700
committerJunio C Hamano <gitster@pobox.com>2023-04-07 14:33:52 -0700
commitf285f68a132109c234d93490671c00218066ace9 (patch)
treecec72ed0d4fb9faa44cd8d23008f90da3239808b /.mailmap
parent0607f793cbe0af16aee6d2480056d891835884bd (diff)
downloadgit-f285f68a132109c234d93490671c00218066ace9.tar.gz
mailmap: change primary address for Emily Shaffer
Emily finally figured out how to set up their alias at DayJob, and would prefer to use nasamuffin@google.com, partially to reduce confusion between IRC and list, and partially because they just like the alias a lot more. Signed-off-by: Emily Shaffer <nasamuffin@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap1
1 files changed, 1 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 95aaa1c833..733e047aa8 100644
--- a/.mailmap
+++ b/.mailmap
@@ -65,6 +65,7 @@ Derrick Stolee <derrickstolee@github.com> <dstolee@microsoft.com>
Deskin Miller <deskinm@umich.edu>
Đoàn Trần Công Danh <congdanhqx@gmail.com> Doan Tran Cong Danh
Dirk Süsserott <newsletter@dirk.my1.cc>
+Emily Shaffer <nasamuffin@google.com> <emilyshaffer@google.com>
Eric Blake <eblake@redhat.com> <ebb9@byu.net>
Eric Hanchrow <eric.hanchrow@gmail.com> <offby1@blarg.net>
Eric S. Raymond <esr@thyrsus.com>