summaryrefslogtreecommitdiff
path: root/mergetools/xxdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-10-13 15:15:56 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-10-13 15:15:56 -0700
commit2d498a7c894444fba5cfb0007e6b757afcde63c6 (patch)
tree05fe72f5a32240cdcc2c50b912b21f020b40d2ad /mergetools/xxdiff
parentSync with Git 2.33.1 (diff)
parentadvice: update message to suggest '--sparse' (diff)
downloadtgif-2d498a7c894444fba5cfb0007e6b757afcde63c6.tar.xz
Merge branch 'ds/add-rm-with-sparse-index'
"git add", "git mv", and "git rm" have been adjusted to avoid updating paths outside of the sparse-checkout definition unless the user specifies a "--sparse" option. * ds/add-rm-with-sparse-index: advice: update message to suggest '--sparse' mv: refuse to move sparse paths rm: skip sparse paths with missing SKIP_WORKTREE rm: add --sparse option add: update --renormalize to skip sparse paths add: update --chmod to skip sparse paths add: implement the --sparse option add: skip tracked paths outside sparse-checkout cone add: fail when adding an untracked sparse file dir: fix pattern matching on dirs dir: select directories correctly t1092: behavior for adding sparse files t3705: test that 'sparse_entry' is unstaged
Diffstat (limited to 'mergetools/xxdiff')
0 files changed, 0 insertions, 0 deletions