path: root/Documentation/git-rm.txt
diff options
authorMatthieu Moy <>2007-07-13 17:41:38 (GMT)
committerJunio C Hamano <>2007-07-14 06:52:46 (GMT)
commitbdecd9d41b3528e17aea2290344c584412e2424e (patch)
treee452049ca2a9cd38462831f73ea7a19fdff760e0 /Documentation/git-rm.txt
parent1701872fc2cfc48c740175848c1ef6fc10eb0e10 (diff)
More permissive "git-rm --cached" behavior without -f.
In the previous behavior, "git-rm --cached" (without -f) had the same restriction as "git-rm". This forced the user to use the -f flag in situations which weren't actually dangerous, like: $ git add foo # oops, I didn't want this $ git rm --cached foo # back to initial situation Previously, the index had to match the file *and* the HEAD. With --cached, the index must now match the file *or* the HEAD. The behavior without --cached is unchanged, but provides better error messages. Signed-off-by: Matthieu Moy <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'Documentation/git-rm.txt')
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/git-rm.txt b/Documentation/git-rm.txt
index 78f45dc..be61a82 100644
--- a/Documentation/git-rm.txt
+++ b/Documentation/git-rm.txt
@@ -14,7 +14,8 @@ DESCRIPTION
Remove files from the working tree and from the index. The
files have to be identical to the tip of the branch, and no
updates to its contents must have been placed in the staging
-area (aka index).
+area (aka index). When --cached is given, the staged content has to
+match either the tip of the branch *or* the file on disk.