summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorLibravatar Elijah Newren <newren@gmail.com>2020-03-27 00:48:59 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-03-27 11:33:30 -0700
commitebb568b9e2539ce2dbb3853ff3d4869a5c690601 (patch)
tree11ada4c7681087704a1096edde0e38637172f5eb /.mailmap
parentunpack-trees: make sparse path messages sound like warnings (diff)
downloadtgif-ebb568b9e2539ce2dbb3853ff3d4869a5c690601.tar.xz
unpack-trees: provide warnings on sparse updates for unmerged paths too
When sparse-checkout runs to update the list of sparsity patterns, it gives warnings if it can't remove paths from the working tree because those files have dirty changes. Add a similar warning for unmerged paths as well. Reviewed-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to '.mailmap')
0 files changed, 0 insertions, 0 deletions