diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-03-09 13:38:23 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-03-09 13:38:23 -0800 |
| commit | 82386b44963f127d6dbe25d48889bde3149e177c (patch) | |
| tree | 56659c554f71478bd7ab0635fc23438faa760f91 /Documentation/config.txt | |
| parent | c2162907e9aa884bdb70208389cb99b181620d51 (diff) | |
| parent | ecc7c8841de40a38637680509f7e1e6ce25d89ca (diff) | |
| download | git-82386b44963f127d6dbe25d48889bde3149e177c.tar.gz | |
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 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index bf3e512921..f0fb25a371 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -503,6 +503,8 @@ include::config/sequencer.txt[] include::config/showbranch.txt[] +include::config/sparse.txt[] + include::config/splitindex.txt[] include::config/ssh.txt[] |