mailmap: change primary address for Derrick Stolee

derrickstolee · gitster · commit 332acc248dd5 · 2022-02-14T13:27:31.000-08:00
Stolee transitioned from Microsoft to GitHub in July 2020, but continued
to use &lt;dstolee@microsoft.com&gt; because it was a valid address. He also
used &lt;stolee@gmail.com&gt; to communicate with the mailing list since
writing plaintext emails is difficult in Outlook. However, recent issues
with GMail delaying mailing list messages created a need to change his
primary email address.

Signed-off-by: Derrick Stolee &lt;derrickstolee@github.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/.mailmap b/.mailmap
@@ -59,8 +59,9 @@ David Reiss <dreiss@facebook.com> <dreiss@dreiss-vmware.(none)>
 David S. Miller <davem@davemloft.net>
 David Turner <novalis@novalis.org> <dturner@twopensource.com>
 David Turner <novalis@novalis.org> <dturner@twosigma.com>
-Derrick Stolee <dstolee@microsoft.com> <stolee@gmail.com>
-Derrick Stolee <dstolee@microsoft.com> Derrick Stolee via GitGitGadget <gitgitgadget@gmail.com>
+Derrick Stolee <derrickstolee@github.com> <stolee@gmail.com>
+Derrick Stolee <derrickstolee@github.com> Derrick Stolee via GitGitGadget <gitgitgadget@gmail.com>
+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>

-Original file line number
+Diff line change
 David S. Miller <[email protected]>
 David Turner <[email protected]> <[email protected]>
 David Turner <[email protected]> <[email protected]>
 -Derrick Stolee <[email protected]> <[email protected]>
 -Derrick Stolee <[email protected]> Derrick Stolee via GitGitGadget <[email protected]>
 +Derrick Stolee <[email protected]> <[email protected]>
 +Derrick Stolee <[email protected]> Derrick Stolee via GitGitGadget <[email protected]>
 +Derrick Stolee <[email protected]> <[email protected]>
 Deskin Miller <[email protected]>
 Đoàn Trần Công Danh <[email protected]> Doan Tran Cong Danh
 Dirk Süsserott <[email protected]>