forked from microsoft/git
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
sparse-index: make mixed
reset
sparse-aware
Due to the introduction of sparse directory entries in the `diff_cache` execution (used internally by `reset --mixed`), explicit `change` and `add_remove` functions are specified for merging of the interior contents of those sparse directories. Additionally, to handle cases in which `reset --mixed` must merge files nested multiple levels deep in directories outside the sparse checkout cone, the `recursive` diff option is added. Signed-off-by: Victoria Dye <vdye@github.com>
- Loading branch information
1 parent
927b179
commit eeef9d6
Showing
2 changed files
with
103 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters