summaryrefslogtreecommitdiff
path: root/git-difftool--helper.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2022-03-09 13:38:23 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2022-03-09 13:38:23 -0800
commit82386b44963f127d6dbe25d48889bde3149e177c (patch)
tree56659c554f71478bd7ab0635fc23438faa760f91 /git-difftool--helper.sh
parentThe ninth batch (diff)
parentrepo_read_index: add config to expect files outside sparse patterns (diff)
downloadtgif-82386b44963f127d6dbe25d48889bde3149e177c.tar.xz
Merge branch 'en/present-despite-skipped'
In sparse-checkouts, files mis-marked as missing from the working tree could lead to later problems. Such files were hard to discover, and harder to correct. Automatically detecting and correcting the marking of such files has been added to avoid these problems. * en/present-despite-skipped: repo_read_index: add config to expect files outside sparse patterns Accelerate clear_skip_worktree_from_present_files() by caching Update documentation related to sparsity and the skip-worktree bit repo_read_index: clear SKIP_WORKTREE bit from files present in worktree unpack-trees: fix accidental loss of user changes t1011: add testcase demonstrating accidental loss of user modifications
Diffstat (limited to 'git-difftool--helper.sh')
0 files changed, 0 insertions, 0 deletions