diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-05-07 12:47:39 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-05-07 12:47:40 +0900 |
| commit | fe069dce6251f40eb3d54861500c92afb0e481d9 (patch) | |
| tree | a414af6ca4ba1fd452249ee59a85157a49bfa119 /git-merge-resolve.sh | |
| parent | Merge branch 'ps/config-global-override' (diff) | |
| parent | rm: honor sparse checkout patterns (diff) | |
| download | tgif-fe069dce6251f40eb3d54861500c92afb0e481d9.tar.xz | |
Merge branch 'mt/add-rm-in-sparse-checkout'
"git add" and "git rm" learned not to touch those paths that are
outside of sparse checkout.
* mt/add-rm-in-sparse-checkout:
rm: honor sparse checkout patterns
add: warn when asked to update SKIP_WORKTREE entries
refresh_index(): add flag to ignore SKIP_WORKTREE entries
pathspec: allow to ignore SKIP_WORKTREE entries on index matching
add: make --chmod and --renormalize honor sparse checkouts
t3705: add tests for `git add` in sparse checkouts
add: include magic part of pathspec on --refresh error
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions