summaryrefslogtreecommitdiff
path: root/Documentation/git-update-cache.txt
diff options
context:
space:
mode:
authorPetr Baudis <pasky@ucw.cz>2005-05-31 16:52:43 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-05 23:57:23 (GMT)
commit9b63f50148bd155c00b6893dbbf48583f7b0848d (patch)
treec1b73762bee105ff0a334e598af2a9b52f559bd4 /Documentation/git-update-cache.txt
parent418aaf847a8b3ffffb4f777a2dd5262ca5ce0ef7 (diff)
downloadgit-9b63f50148bd155c00b6893dbbf48583f7b0848d.zip
git-9b63f50148bd155c00b6893dbbf48583f7b0848d.tar.gz
git-9b63f50148bd155c00b6893dbbf48583f7b0848d.tar.bz2
[PATCH] Make git-update-cache --force-remove regular
Make the --force-remove flag behave same as --add, --remove and --replace. This means I can do git-update-cache --force-remove -- file1.c file2.c which is probably saner and also makes it easier to use in cg-rm. Signed-off-by: Petr Baudis <pasky@ucw.cz> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'Documentation/git-update-cache.txt')
-rw-r--r--Documentation/git-update-cache.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-update-cache.txt b/Documentation/git-update-cache.txt
index 604411d..947f2bd 100644
--- a/Documentation/git-update-cache.txt
+++ b/Documentation/git-update-cache.txt
@@ -12,7 +12,7 @@ SYNOPSIS
'git-update-cache'
[--add] [--remove] [--refresh] [--replace]
[--ignore-missing]
- [--force-remove <file>]
+ [--force-remove]
[--cacheinfo <mode> <object> <file>]\*
[--] [<file>]\*
@@ -49,7 +49,7 @@ OPTIONS
--force-remove::
Remove the file from the index even when the working directory
- still has such a file.
+ still has such a file. (Implies --remove.)
--replace::
By default, when a file `path` exists in the index,