summaryrefslogtreecommitdiff
path: root/builtin-log.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-12-17 01:09:41 -0800
committerLibravatar Junio C Hamano <junkio@cox.net>2006-12-17 01:14:43 -0800
commitc33ab0dd100d91d417b5ed3378acbf3310c07cec (patch)
tree297253b1e7b6226f1eff5a8010f0fc7fc3f4094a /builtin-log.c
parentupdate-index: make D/F conflict error a bit more verbose. (diff)
downloadtgif-c33ab0dd100d91d417b5ed3378acbf3310c07cec.tar.xz
git-add: remove conflicting entry when adding.
When replacing an existing file A with a directory A that has a file A/B in it in the index, 'git add' did not succeed because it forgot to pass the allow-replace flag to add_cache_entry(). It might be safer to leave this as an error and require the user to explicitly remove the existing A first before adding A/B since it is an unusual case, but doing that automatically is much easier to use. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'builtin-log.c')
0 files changed, 0 insertions, 0 deletions