]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f712632 a38cb98)
Merge branch 'jk/mailmap-only-at-root'
authorJunio C Hamano <gitster@pobox.com>
Thu, 18 Feb 2021 01:21:41 +0000 (17:21 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 18 Feb 2021 01:21:42 +0000 (17:21 -0800)
commit9bdccbcda77df036edef5badda76418d0ae80997
tree01e0f13bd58c86ff366225327ca49fc79a3af0catree | snapshot
parentf712632a518ffd2611ae4a33cce43b53c73ce2c1commit | diff
parenta38cb9878ab686d3b7a19e46d8c3fff79cdccf4bcommit | diff
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
Unnamed repository; edit this file 'description' to name the repository.