diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-01-22 11:19:59 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-01-22 11:19:59 -0800 |
commit | e77c5d0bdc4c4f3ca9b8fc6f7147c3938be402a8 (patch) | |
tree | 852f2ac37847e9f84c8eda3c97b85932c323b4e5 /git-reset.html | |
parent | 60b372a5042435e4194fc32ee9268c4918b8e9be (diff) | |
download | git-htmldocs-e77c5d0bdc4c4f3ca9b8fc6f7147c3938be402a8.tar.gz |
Autogenerated HTML docs for v1.8.1.1-347-g9591f
Diffstat (limited to 'git-reset.html')
-rw-r--r-- | git-reset.html | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/git-reset.html b/git-reset.html index b25a1b078..40952ffec 100644 --- a/git-reset.html +++ b/git-reset.html @@ -746,8 +746,8 @@ git-reset(1) Manual Page <h2 id="_synopsis">SYNOPSIS</h2>
<div class="sectionbody">
<div class="verseblock">
-<pre class="content"><em>git reset</em> [-q] [<commit>] [--] <paths>…
-<em>git reset</em> (--patch | -p) [<commit>] [--] [<paths>…]
+<pre class="content"><em>git reset</em> [-q] [<tree-ish>] [--] <paths>…
+<em>git reset</em> (--patch | -p) [<tree-sh>] [--] [<paths>…]
<em>git reset</em> [--soft | --mixed | --hard | --merge | --keep] [-q] [<commit>]</pre>
<div class="attribution">
</div></div>
@@ -756,18 +756,18 @@ git-reset(1) Manual Page <div class="sect1">
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
-<div class="paragraph"><p>In the first and second form, copy entries from <commit> to the index.
+<div class="paragraph"><p>In the first and second form, copy entries from <tree-ish> to the index.
In the third form, set the current branch head (HEAD) to <commit>, optionally
-modifying index and working tree to match. The <commit> defaults to HEAD
-in all forms.</p></div>
+modifying index and working tree to match. The <tree-ish>/<commit> defaults
+to HEAD in all forms.</p></div>
<div class="dlist"><dl>
<dt class="hdlist1">
-<em>git reset</em> [-q] [<commit>] [--] <paths>…
+<em>git reset</em> [-q] [<tree-ish>] [--] <paths>…
</dt>
<dd>
<p>
This form resets the index entries for all <paths> to their
- state at <commit>. (It does not affect the working tree, nor
+ state at <tree-ish>. (It does not affect the working tree, nor
the current branch.)
</p>
<div class="paragraph"><p>This means that <code>git reset <paths></code> is the opposite of <code>git add
@@ -780,12 +780,12 @@ can copy the contents of a path out of a commit to the index and to the working tree in one go.</p></div>
</dd>
<dt class="hdlist1">
-<em>git reset</em> (--patch | -p) [<commit>] [--] [<paths>…]
+<em>git reset</em> (--patch | -p) [<tree-ish>] [--] [<paths>…]
</dt>
<dd>
<p>
Interactively select hunks in the difference between the index
- and <commit> (defaults to HEAD). The chosen hunks are applied
+ and <tree-ish> (defaults to HEAD). The chosen hunks are applied
in reverse to the index.
</p>
<div class="paragraph"><p>This means that <code>git reset -p</code> is the opposite of <code>git add -p</code>, i.e.
@@ -1348,7 +1348,7 @@ entries:</p></div> <div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2012-11-13 14:31:09 PST
+Last updated 2013-01-22 11:18:46 PST
</div>
</div>
</body>
|