diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-09-17 19:12:29 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-09-17 19:12:29 (GMT) |
| commit | 8833ccd7d020a6160240a4933be91370e6f59c48 (patch) | |
| tree | c6fdbdc2cacb79036fc26eae8dee901465ec52ec /ll-merge.c | |
| parent | d6579d94365884eb56f50562441d5344d5acd838 (diff) | |
| parent | 73f9145fbf748d39dd1e145ec846a5481cf7a36f (diff) | |
| download | git-8833ccd7d020a6160240a4933be91370e6f59c48.zip git-8833ccd7d020a6160240a4933be91370e6f59c48.tar.gz git-8833ccd7d020a6160240a4933be91370e6f59c48.tar.bz2 | |
Merge branch 'dt/untracked-subdir' into maint
The experimental untracked-cache feature were buggy when paths with
a few levels of subdirectories are involved.
* dt/untracked-subdir:
untracked cache: fix entry invalidation
untracked-cache: fix subdirectory handling
t7063: use --force-untracked-cache to speed up a bit
untracked-cache: support sparse checkout
Diffstat (limited to 'll-merge.c')
0 files changed, 0 insertions, 0 deletions