summaryrefslogtreecommitdiffstats
path: root/git-commit.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2007-11-14 12:17:22 +0000
committerJunio C Hamano <junio@hera.kernel.org>2007-11-14 12:17:22 +0000
commit361c1335bb152db70cab1086e3f8505e63b60354 (patch)
treec11c838f736d02588da0a6f16183690a3c60a405 /git-commit.html
parent14aca6e3dcbe193374c3203aeebfe7d1c52d7963 (diff)
downloadgit-htmldocs-361c1335bb152db70cab1086e3f8505e63b60354.tar.gz
Autogenerated HTML docs for v1.5.3.5-666-gfb5f
Diffstat (limited to 'git-commit.html')
-rw-r--r--git-commit.html13
1 files changed, 8 insertions, 5 deletions
diff --git a/git-commit.html b/git-commit.html
index 48283c0dd..0283f709f 100644
--- a/git-commit.html
+++ b/git-commit.html
@@ -511,10 +511,13 @@ that, you can recover from it with <a href="git-reset.html">git-reset(1)</a>.</p
<div class="sectionbody">
<p>When recording your own work, the contents of modified files in
your working tree are temporarily stored to a staging area
-called the "index" with <a href="git-add.html">git-add(1)</a>. Removal
-of a file is staged with <a href="git-rm.html">git-rm(1)</a>. After building the
-state to be committed incrementally with these commands, <tt>git
-commit</tt> (without any pathname parameter) is used to record what
+called the "index" with <a href="git-add.html">git-add(1)</a>. A file can be
+reverted back, only in the index but not in the working tree,
+to that of the last commit with <tt>git-reset HEAD &#8212; &lt;file&gt;</tt>,
+which effectively reverts <tt>git-add</tt> and prevents the changes to
+this file from participating in the next commit. After building
+the state to be committed incrementally with these commands,
+<tt>git commit</tt> (without any pathname parameter) is used to record what
has been staged so far. This is the most basic form of the
command. An example:</p>
<div class="listingblock">
@@ -701,7 +704,7 @@ Junio C Hamano &lt;junkio@cox.net&gt;</p>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 08-Aug-2007 09:20:37 UTC
+Last updated 14-Nov-2007 12:11:25 UTC
</div>
</div>
</body>