summaryrefslogtreecommitdiff
path: root/userdiff.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-01-28 14:24:53 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-01-28 17:29:33 -0800
commit4cc8d6c62db1f82b3c98468806d2ee54c7e037ca (patch)
tree8c829e1c28c2c8113cfd349c3f3687fcf7cf2b1b /userdiff.c
parentsend-pack: do not send unknown object name from ".have" to pack-objects (diff)
downloadtgif-4cc8d6c62db1f82b3c98468806d2ee54c7e037ca.tar.xz
add -u: do not fail to resolve a path as deleted
After you resolve a conflicted merge to remove the path, "git add -u" failed to record the removal. Instead it errored out by saying that the removed path is not found in the work tree, but that is what the user already knows, and the wanted to record the removal as the resolution, so the error does not make sense. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'userdiff.c')
0 files changed, 0 insertions, 0 deletions