Junio C Hamano 192268c197 Add git-update-cache --replace option. ...

When "path" exists as a file or a symlink in the index, an
attempt to add "path/file" is refused because it results in file
vs directory conflict.  Similarly when "path/file1",
"path/file2", etc. exist, an attempt to add "path" as a file or
a symlink is refused.  With git-update-cache --replace, these
existing entries that conflict with the entry being added are
automatically removed from the cache, with warning messages.

Signed-off-by: Junio C Hamano <junkio@cox.net>

2005-05-07 21:55:21 -07:00

..

core-git.txt

Add git-update-cache --replace option.

2005-05-07 21:55:21 -07:00