path: root/Documentation/user-manual.txt
diff options
authorJunio C Hamano <>2007-12-01 00:21:33 (GMT)
committerJunio C Hamano <>2007-12-01 00:21:33 (GMT)
commit65c6a4696a760f518c9f262705de030323c11146 (patch)
tree89f9866fb6611e0b8266c27b9ac77267e696869a /Documentation/user-manual.txt
parent9ae8fcb36ac9fde8e048a304cc3717f2c7914e78 (diff)
parent10455d2a955a29db1809be139177e4e298771eb0 (diff)
Merge branch 'maint'
* maint: Replace the word 'update-cache' by 'update-index' everywhere cvsimport: fix usage of cvsimport.module t7003-filter-branch: Fix test of a failing --msg-filter. cvsimport: miscellaneous packed-ref fixes cvsimport: use rev-parse to support packed refs Add basic cvsimport tests
Diffstat (limited to 'Documentation/user-manual.txt')
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 0aaed10..93a47b4 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/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.