summaryrefslogtreecommitdiff
path: root/fetch-pack.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-02-17 17:21:41 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-02-17 17:21:42 -0800
commit9bdccbcda77df036edef5badda76418d0ae80997 (patch)
tree01e0f13bd58c86ff366225327ca49fc79a3af0ca /fetch-pack.c
parentMerge branch 'mt/grep-cached-untracked' (diff)
parentmailmap: only look for .mailmap in work tree (diff)
downloadtgif-9bdccbcda77df036edef5badda76418d0ae80997.tar.xz
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 'fetch-pack.c')
0 files changed, 0 insertions, 0 deletions