From: Junio C Hamano Date: Sat, 1 Dec 2007 01:57:43 +0000 (+0000) Subject: Autogenerated HTML docs for v1.5.3.6-985-g65c6a4 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=774239c4e891eb86bc5465f240515ed6be64ae6c;p=git.git Autogenerated HTML docs for v1.5.3.6-985-g65c6a4 --- diff --git a/user-manual.html b/user-manual.html index 7478ff325..0417d839e 100644 --- a/user-manual.html +++ b/user-manual.html @@ -1596,7 +1596,7 @@ longer exist, or that new files should be added, you should use the —remove and —add flags respectively.

NOTE! A —remove flag does not mean that subsequent filenames will necessarily be removed: if the files still exist in your directory structure, the index will be updated with their new status, not -removed. The only thing —remove means is that update-cache will be +removed. The only thing —remove means is that update-index will be considering a removed file to be a valid thing, and if the file really does not exist any more, it will update the index accordingly.

As a special case, you can also do git-update-index —refresh, which will refresh the "stat" information of each index to match the current diff --git a/user-manual.txt b/user-manual.txt index 0aaed10c7..93a47b439 100644 --- a/user-manual.txt +++ b/user-manual.txt @@ -3707,7 +3707,7 @@ should use the `--remove` and `--add` flags respectively. NOTE! A `--remove` flag does 'not' mean that subsequent filenames will necessarily be removed: if the files still exist in your directory structure, the index will be updated with their new status, not -removed. The only thing `--remove` means is that update-cache will be +removed. The only thing `--remove` means is that update-index will be considering a removed file to be a valid thing, and if the file really does not exist any more, it will update the index accordingly.