diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2007-07-14 08:26:56 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2007-07-14 08:26:56 +0000 |
| commit | 02f130bd23751fc40d2c784821e3f05536363d7c (patch) | |
| tree | 0cb967d1f9f8dc959914a0c5ec1b278c6951139f /git-rm.txt | |
| parent | 1e6e00634f257c354c4261ef7da2b8dc495e3c99 (diff) | |
| download | git-htmldocs-02f130bd23751fc40d2c784821e3f05536363d7c.tar.gz | |
Autogenerated HTML docs for v1.5.3-rc1-16-g9d6f
Diffstat (limited to 'git-rm.txt')
| -rw-r--r-- | git-rm.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/git-rm.txt b/git-rm.txt index 78f45dca2..be61a8216 100644 --- a/git-rm.txt +++ b/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 |