From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 27 Jan 2020 21:26:07 +0000 (-0800)
Subject: Sync with maint
X-Git-Tag: v2.26.0-rc0~119
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c7a62075917b3340f908093f63f1161c44ed1475;p=thirdparty%2Fgit.git

Sync with maint

* maint:
  .mailmap: fix erroneous authorship for Johannes Schindelin
---

c7a62075917b3340f908093f63f1161c44ed1475