diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-02-17 17:21:41 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-02-17 17:21:42 -0800 |
| commit | 9bdccbcda77df036edef5badda76418d0ae80997 (patch) | |
| tree | 01e0f13bd58c86ff366225327ca49fc79a3af0ca /builtin/diff-files.c | |
| parent | f712632a518ffd2611ae4a33cce43b53c73ce2c1 (diff) | |
| parent | a38cb9878ab686d3b7a19e46d8c3fff79cdccf4b (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
Diffstat (limited to 'builtin/diff-files.c')
0 files changed, 0 insertions, 0 deletions