summaryrefslogtreecommitdiffstats
path: root/git-reset.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2006-12-26 09:11:43 +0000
committerJunio C Hamano <junio@hera.kernel.org>2006-12-26 09:11:43 +0000
commitd793de567fd684f8a0cf42af9252cb37cba2d2b0 (patch)
treec8e726b6c2bd49484f6f478013dee1c2be05dc1e /git-reset.html
parent3d2adc7384e658641a74bdd5ed6069d6955ee373 (diff)
downloadgit-htmldocs-d793de567fd684f8a0cf42af9252cb37cba2d2b0.tar.gz
Autogenerated HTML docs for v1.5.0-rc0-g6934
Diffstat (limited to 'git-reset.html')
-rw-r--r--git-reset.html12
1 files changed, 8 insertions, 4 deletions
diff --git a/git-reset.html b/git-reset.html
index d9a2baa37..d331aba3f 100644
--- a/git-reset.html
+++ b/git-reset.html
@@ -272,7 +272,9 @@ git-reset(1) Manual Page
</div>
<h2>SYNOPSIS</h2>
<div class="sectionbody">
-<p><em>git-reset</em> [--mixed | --soft | --hard] [&lt;commit-ish&gt;]</p>
+<div class="verseblock">
+<div class="content"><em>git-reset</em> [--mixed | --soft | --hard] [&lt;commit&gt;]
+<em>git-reset</em> [--mixed] &lt;commit&gt; [--] &lt;paths&gt;&#8230;</div></div>
</div>
<h2>DESCRIPTION</h2>
<div class="sectionbody">
@@ -283,6 +285,8 @@ commit (or set of commits) and want to redo that part without showing
the undo in the history.</p>
<p>If you want to undo a commit other than the latest on a branch,
<a href="git-revert.html">git-revert(1)</a> is your friend.</p>
+<p>The second form with <em>paths</em> is used to revert selected paths in
+the index from a given commit, without moving HEAD.</p>
</div>
<h2>OPTIONS</h2>
<div class="sectionbody">
@@ -315,11 +319,11 @@ the undo in the history.</p>
<p>
Matches the working tree and index to that of the tree being
switched to. Any changes to tracked files in the working tree
- since &lt;commit-ish&gt; are lost.
+ since &lt;commit&gt; are lost.
</p>
</dd>
<dt>
-&lt;commit-ish&gt;
+&lt;commit&gt;
</dt>
<dd>
<p>
@@ -566,7 +570,7 @@ At this point the index file still has all the WIP changes you
</div>
<div id="footer">
<div id="footer-text">
-Last updated 16-Dec-2006 07:43:52 UTC
+Last updated 26-Dec-2006 09:11:35 UTC
</div>
</div>
</body>