diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-08-24 15:32:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-08-24 15:32:35 -0700 |
| commit | 2f713668784266b4682816fadcf2034d846e9cc1 (patch) | |
| tree | 22af9c76e4c6fcd9663c68d10fd0152725285e65 /t/t6402-merge-rename.sh | |
| parent | Merge branch 'jc/bisect-sans-show-branch' (diff) | |
| parent | add: remove ensure_full_index() with --renormalize (diff) | |
| download | tgif-2f713668784266b4682816fadcf2034d846e9cc1.tar.xz | |
Merge branch 'ds/add-with-sparse-index'
"git add" can work better with the sparse index.
* ds/add-with-sparse-index:
add: remove ensure_full_index() with --renormalize
add: ignore outside the sparse-checkout in refresh()
pathspec: stop calling ensure_full_index
add: allow operating on a sparse-only index
t1092: test merge conflicts outside cone
Diffstat (limited to 't/t6402-merge-rename.sh')
0 files changed, 0 insertions, 0 deletions