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>

1 files changed, 9 insertions, 1 deletions

diff --git a/Documentation/core-git.txt b/Documentation/core-git.txt
index 014b97964e..5e702fd832 100644
--- a/Documentation/core-git.txt
+++ b/Documentation/core-git.txt
@@ -1098,7 +1098,7 @@ returns the name of the temporary file in the following format:
 ################################################################
 git-update-cache
 	git-update-cache
-	     [--add] [--remove] [--refresh]
+	     [--add] [--remove] [--refresh] [--replace]
 	     [--ignore-missing]
 	     [--force-remove <file>]
 	     [--cacheinfo <mode> <object> <file>]*
@@ -1135,6 +1135,14 @@ using the various options:
 	Remove the file from the index even when the working directory
 	still has such a file.
 
+--replace
+	By default, when a file "path" exists in the index,
+	git-update-cache refuses an attempt to add "path/file".
+	Similarly if a file "path/file" exists, a file "path"
+	cannot be added.  With --replace flag, existing entries
+	that conflicts with the entry being added are
+	automatically removed with warning messages.
+
 --
 	Do not interpret any more arguments as options.