diff options
author | Junio C Hamano <gitster@pobox.com> | 2020-08-24 14:54:29 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-08-24 14:54:29 -0700 |
commit | 11f433f79c790bcb5feae71b0320161d7ab7dea7 (patch) | |
tree | 3e45944daa791896d03ab00afa52a0275c10273a /t/t3308-notes-merge.sh | |
parent | Merge branch 'ds/midx-repack-to-batch-size' (diff) | |
parent | dir: avoid prematurely marking nonbare repositories as matches (diff) | |
download | tgif-11f433f79c790bcb5feae71b0320161d7ab7dea7.tar.xz |
Merge branch 'en/dir-nonbare-embedded'
"ls-files -o" mishandled the top-level directory of another git
working tree that hangs in the current git working tree.
* en/dir-nonbare-embedded:
dir: avoid prematurely marking nonbare repositories as matches
t3000: fix some test description typos
Diffstat (limited to 't/t3308-notes-merge.sh')
0 files changed, 0 insertions, 0 deletions