diff options
author | Petr Baudis <pasky@ucw.cz> | 2005-05-31 18:52:43 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-05 16:57:23 -0700 |
commit | 9b63f50148bd155c00b6893dbbf48583f7b0848d (patch) | |
tree | c1b73762bee105ff0a334e598af2a9b52f559bd4 /Documentation | |
parent | [PATCH] rename git-rpush and git-rpull to git-ssh-push and git-ssh-pull (diff) | |
download | tgif-9b63f50148bd155c00b6893dbbf48583f7b0848d.tar.xz |
[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')
-rw-r--r-- | Documentation/git-update-cache.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-update-cache.txt b/Documentation/git-update-cache.txt index 604411d6d7..947f2bded0 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, |