From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 18 Feb 2021 01:21:41 +0000 (-0800)
Subject: Merge branch 'jk/mailmap-only-at-root'
X-Git-Tag: v2.31.0-rc0~38
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9bdccbcda77df036edef5badda76418d0ae80997;p=thirdparty%2Fgit.git

Merge branch 'jk/mailmap-only-at-root'

The .mailmap is documented to be read only from the root level of a
working tree, but a stray file in a bare repository also was read
by accident, which has been corrected.

* jk/mailmap-only-at-root:
  mailmap: only look for .mailmap in work tree
---

9bdccbcda77df036edef5badda76418d0ae80997