diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-05-07 21:55:21 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-05-07 21:55:21 -0700 |
| commit | 192268c197c0f143989662f648b1d900014e7d89 (patch) | |
| tree | 54db11a2f64efe7aba6cdedba4398f7228f6c646 /commit-tree.c | |
| parent | git-update-cache refuses to add a file where a directory is registed. (diff) | |
| download | git-192268c197c0f143989662f648b1d900014e7d89.tar.gz git-192268c197c0f143989662f648b1d900014e7d89.zip | |
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>
Diffstat (limited to 'commit-tree.c')
0 files changed, 0 insertions, 0 deletions