summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-02-24 00:58:04 (GMT)
committerJunio C Hamano <gitster@pobox.com>2022-02-24 00:58:04 (GMT)
commit008adee2087e8e78f767bbfdfd49d1d1eabf9469 (patch)
tree9a1462ffc0d8cb8a222fa00e01111c7245c9a580
parent8813596531c08ed7488f85805cd0ec974a9c7c96 (diff)
parent332acc248dd5213cb1d61be5538bb47ad26770e5 (diff)
downloadgit-008adee2087e8e78f767bbfdfd49d1d1eabf9469.zip
git-008adee2087e8e78f767bbfdfd49d1d1eabf9469.tar.gz
git-008adee2087e8e78f767bbfdfd49d1d1eabf9469.tar.bz2
Merge branch 'ds/mailmap'
Update mailmap entries. * ds/mailmap: mailmap: change primary address for Derrick Stolee
-rw-r--r--.mailmap5
1 files changed, 3 insertions, 2 deletions
diff --git a/.mailmap b/.mailmap
index 9c6a446..07db36a 100644
--- 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>