From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 24 Feb 2022 00:58:04 +0000 (-0800)
Subject: Merge branch 'ds/mailmap'
X-Git-Tag: v2.36.0-rc0~118
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=008adee2087e8e78f767bbfdfd49d1d1eabf9469;p=thirdparty%2Fgit.git

Merge branch 'ds/mailmap'

Update mailmap entries.

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

008adee2087e8e78f767bbfdfd49d1d1eabf9469