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.html | |
| parent | 1e6e00634f257c354c4261ef7da2b8dc495e3c99 (diff) | |
| download | git-htmldocs-02f130bd23751fc40d2c784821e3f05536363d7c.tar.gz | |
Autogenerated HTML docs for v1.5.3-rc1-16-g9d6f
Diffstat (limited to 'git-rm.html')
| -rw-r--r-- | git-rm.html | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/git-rm.html b/git-rm.html index 728b9531a..ccf0d8d92 100644 --- a/git-rm.html +++ b/git-rm.html @@ -279,7 +279,8 @@ git-rm(1) Manual Page <p>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).</p>
+area (aka index). When --cached is given, the staged content has to
+match either the tip of the branch <strong>or</strong> the file on disk.</p>
</div>
<h2>OPTIONS</h2>
<div class="sectionbody">
@@ -414,7 +415,7 @@ git-rm -f git-*.sh </div>
<div id="footer">
<div id="footer-text">
-Last updated 16-Jun-2007 09:49:21 UTC
+Last updated 14-Jul-2007 08:26:16 UTC
</div>
</div>
</body>
|