aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2023-10-13 14:18:27 -0700
committerJunio C Hamano <gitster@pobox.com>2023-10-13 14:18:27 -0700
commite56b9edf228928fed72578bb7a4e6a35b47c551c (patch)
tree66cfcbdb64e32c389699f85dc3049683b8296bee
parentThe seventeenth batch (diff)
parentmailmap: change primary address for Derrick Stolee (diff)
downloadgit-e56b9edf228928fed72578bb7a4e6a35b47c551c.tar.gz
git-e56b9edf228928fed72578bb7a4e6a35b47c551c.zip
Merge branch 'ds/mailmap-entry-update'
Update mailmap entry for Derrick. * ds/mailmap-entry-update: mailmap: change primary address for Derrick Stolee
-rw-r--r--.mailmap6
1 files changed, 3 insertions, 3 deletions
diff --git a/.mailmap b/.mailmap
index dc31d70b8c..82129be449 100644
--- a/.mailmap
+++ b/.mailmap
@@ -59,9 +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 <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>
+Derrick Stolee <stolee@gmail.com> <derrickstolee@github.com>
+Derrick Stolee <stolee@gmail.com> Derrick Stolee via GitGitGadget <gitgitgadget@gmail.com>
+Derrick Stolee <stolee@gmail.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>