diff options
Diffstat (limited to 'Documentation/git-rm.txt')
| -rw-r--r-- | Documentation/git-rm.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-rm.txt b/Documentation/git-rm.txt index a65f24a0f6..be61a82164 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 @@ -95,4 +96,3 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>. GIT --- Part of the gitlink:git[7] suite - |