mailmap: change primary address for Emily Shaffer

Emily Shaffer · gitster · commit f285f68a1321 · 2023-04-07T14:33:52.000-07:00
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 &lt;nasamuffin@google.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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>

-Original file line number
+Diff line change
 Deskin Miller <[email protected]>
 Đoàn Trần Công Danh <[email protected]> Doan Tran Cong Danh
 Dirk Süsserott <[email protected]>
 +Emily Shaffer <[email protected]> <[email protected]>
 Eric Blake <[email protected]> <[email protected]>
 Eric Hanchrow <[email protected]> <[email protected]>
 Eric S. Raymond <[email protected]>