summaryrefslogtreecommitdiff
path: root/mergetools/winmerge
diff options
context:
space:
mode:
authorLibravatar Derrick Stolee <dstolee@microsoft.com>2021-09-24 15:39:14 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-09-28 10:31:02 -0700
commit6579e788c0a4b9468c5e2954a0868f9db0496e43 (patch)
tree45c3cbec6276f2afdcea800939e027ee3a3fcae1 /mergetools/winmerge
parentmv: refuse to move sparse paths (diff)
downloadtgif-6579e788c0a4b9468c5e2954a0868f9db0496e43.tar.xz
advice: update message to suggest '--sparse'
The previous changes modified the behavior of 'git add', 'git rm', and 'git mv' to not adjust paths outside the sparse-checkout cone, even if they exist in the working tree and their cache entries lack the SKIP_WORKTREE bit. The intention is to warn users that they are doing something potentially dangerous. The '--sparse' option was added to each command to allow careful users the same ability they had before. To improve the discoverability of this new functionality, add a message to advice.updateSparsePath that mentions the existence of the option. The previous set of changes also modified the purpose of this message to include possibly a list of paths instead of only a list of pathspecs. Make the warning message more clear about this new behavior. Signed-off-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools/winmerge')
0 files changed, 0 insertions, 0 deletions