Merge branch 'ds/mailmap-entry-update'

gitster · gitster · commit e56b9edf2289 · 2023-10-13T14:18:27.000-07:00
Update mailmap entry for Derrick.

* ds/mailmap-entry-update:
  mailmap: change primary address for Derrick Stolee
diff --git 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>

-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 <derrickstolee@github.com> <stolee@gmail.com>
 -Derrick Stolee <derrickstolee@github.com> Derrick Stolee via GitGitGadget <[email protected]>
 -Derrick Stolee <derrickstolee@github.com> <[email protected]>
 +Derrick Stolee <stolee@gmail.com> <derrickstolee@github.com>
 +Derrick Stolee <stolee@gmail.com> Derrick Stolee via GitGitGadget <[email protected]>
 +Derrick Stolee <stolee@gmail.com> <[email protected]>
 Deskin Miller <[email protected]>
 Đoàn Trần Công Danh <[email protected]> Doan Tran Cong Danh
 Dirk Süsserott <[email protected]>