diff options
author | Junio C Hamano <junio@hera.kernel.org> | 2009-09-08 00:55:23 +0000 |
---|---|---|
committer | Junio C Hamano <junio@hera.kernel.org> | 2009-09-08 00:55:23 +0000 |
commit | c28068f42827f92c7c73c184e4fd11ceba0c73da (patch) | |
tree | 2ea9bf073e1f773ca1fcfb8bf76ec28ead3687e4 /git-reset.html | |
parent | 35b47ca5285a4059792ba937f8e09b2ab4a7adf4 (diff) | |
download | git-htmldocs-c28068f42827f92c7c73c184e4fd11ceba0c73da.tar.gz |
Autogenerated HTML docs for v1.6.5-rc0
Diffstat (limited to 'git-reset.html')
-rw-r--r-- | git-reset.html | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/git-reset.html b/git-reset.html index 83ac1e425..a381dc44b 100644 --- a/git-reset.html +++ b/git-reset.html @@ -322,7 +322,8 @@ git-reset(1) Manual Page <div class="sectionbody">
<div class="verseblock">
<div class="content"><em>git reset</em> [--mixed | --soft | --hard | --merge] [-q] [<commit>]
-<em>git reset</em> [-q] [<commit>] [--] <paths>…</div></div>
+<em>git reset</em> [-q] [<commit>] [--] <paths>…
+<em>git reset</em> --patch [<commit>] [--] [<paths>…]</div></div>
</div>
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
@@ -333,8 +334,9 @@ commit (or set of commits) and want to redo that part without showing the undo in the history.</p></div>
<div class="para"><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></div>
-<div class="para"><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>
+<div class="para"><p>The second and third forms with <em>paths</em> and/or --patch are used to
+revert selected paths in the index from a given commit, without moving
+HEAD.</p></div>
</div>
<h2 id="_options">OPTIONS</h2>
<div class="sectionbody">
@@ -381,6 +383,21 @@ the index from a given commit, without moving HEAD.</p></div> </p>
</dd>
<dt>
+-p
+</dt>
+<dt>
+--patch
+</dt>
+<dd>
+<p>
+ Interactively select hunks in the difference between the index
+ and <commit> (defaults to HEAD). The chosen hunks are applied
+ in reverse to the index.
+</p>
+<div class="para"><p>This means that <tt>git reset -p</tt> is the opposite of <tt>git add -p</tt> (see
+<a href="git-add.html">git-add(1)</a>).</p></div>
+</dd>
+<dt>
-q
</dt>
<dd>
@@ -701,7 +718,7 @@ Adds the file to the index again. </div>
<div id="footer">
<div id="footer-text">
-Last updated 2009-07-01 02:31:01 UTC
+Last updated 2009-09-08 00:55:00 UTC
</div>
</div>
</body>
|