X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-rm.txt;h=be61a821642ada0a0e8e3303aa81463c716fd970;hb=ee787400de25ed419f40e70698ba35db475b2d61;hp=78f45dca2e37415cbeafb02db559edc6ca511d51;hpb=abc403f58452da667b261274a1091af61dfec35c;p=git.git

diff --git a/Documentation/git-rm.txt b/Documentation/git-rm.txt
index 78f45dca2..be61a8216 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.
 
 
 OPTIONS