author | Junio C Hamano <junkio@cox.net> | |
Sun, 8 May 2005 04:55:21 +0000 (21:55 -0700) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Sun, 8 May 2005 04:55:21 +0000 (21:55 -0700) | ||
commit | 192268c197c0f143989662f648b1d900014e7d89 | |
tree | 54db11a2f64efe7aba6cdedba4398f7228f6c646 | tree | snapshot |
parent | 0f1e4f04013fec0ba8a51a93fc5d3ec6df706168 | commit | diff |
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>
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>
Documentation/core-git.txt | diff | blob | history | |
cache.h | diff | blob | history | |
read-cache.c | diff | blob | history | |
tree.c | diff | blob | history | |
update-cache.c | diff | blob | history |