Merge branch 'ds/mailmap'
commit008adee2087e8e78f767bbfdfd49d1d1eabf9469
authorJunio C Hamano <gitster@pobox.com>
Thu, 24 Feb 2022 00:58:04 +0000 (23 16:58 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 24 Feb 2022 00:58:04 +0000 (23 16:58 -0800)
tree9a1462ffc0d8cb8a222fa00e01111c7245c9a580
parent8813596531c08ed7488f85805cd0ec974a9c7c96
parent332acc248dd5213cb1d61be5538bb47ad26770e5
Merge branch 'ds/mailmap'

Update mailmap entries.

* ds/mailmap:
  mailmap: change primary address for Derrick Stolee