summaryrefslogtreecommitdiffstats
path: root/git-reset.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-11-13 14:32:04 -0800
committerJunio C Hamano <gitster@pobox.com>2012-11-13 14:32:04 -0800
commita129545d44f1f0fe9976ed87b9a7331bf239b7d8 (patch)
tree52268e539a6b33e18401455ea13cf579c615dc80 /git-reset.html
parent3b4382b85a92a6419a8f05510a9b583e711b5071 (diff)
downloadgit-htmldocs-a129545d44f1f0fe9976ed87b9a7331bf239b7d8.tar.gz
Autogenerated HTML docs for v1.8.0-150-gb0b00
Diffstat (limited to 'git-reset.html')
-rw-r--r--git-reset.html10
1 files changed, 5 insertions, 5 deletions
diff --git a/git-reset.html b/git-reset.html
index 2035c076f..4a84aad9c 100644
--- a/git-reset.html
+++ b/git-reset.html
@@ -585,7 +585,7 @@ git-reset(1) Manual Page
<div class="verseblock">
<div class="verseblock-content"><em>git reset</em> [-q] [&lt;commit&gt;] [--] &lt;paths&gt;&#8230;
<em>git reset</em> (--patch | -p) [&lt;commit&gt;] [--] [&lt;paths&gt;&#8230;]
-<em>git reset</em> (--soft | --mixed | --hard | --merge | --keep) [-q] [&lt;commit&gt;]</div>
+<em>git reset</em> [--soft | --mixed | --hard | --merge | --keep] [-q] [&lt;commit&gt;]</div>
<div class="verseblock-attribution">
</div></div>
</div>
@@ -628,14 +628,14 @@ you can use it to selectively reset hunks. See the <tt>`Interactive Mode''
section of linkgit:git-add[1] to learn how to operate the `--patch</tt> mode.</p></div>
</dd>
<dt class="hdlist1">
-<em>git reset</em> --&lt;mode&gt; [&lt;commit&gt;]
+<em>git reset</em> [&lt;mode&gt;] [&lt;commit&gt;]
</dt>
<dd>
<p>
This form resets the current branch head to &lt;commit&gt; and
possibly updates the index (resetting it to the tree of &lt;commit&gt;) and
- the working tree depending on &lt;mode&gt;, which
- must be one of the following:
+ the working tree depending on &lt;mode&gt;. If &lt;mode&gt; is omitted,
+ defaults to "--mixed". The &lt;mode&gt; must be one of the following:
</p>
<div class="dlist"><dl>
<dt class="hdlist1">
@@ -1171,7 +1171,7 @@ entries:</p></div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2012-05-02 15:00:44 PDT
+Last updated 2012-11-13 14:31:09 PDT
</div>
</div>
</body>