summaryrefslogtreecommitdiffstats
path: root/git-reset.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-02-27 15:07:15 -0800
committerJunio C Hamano <gitster@pobox.com>2014-02-27 15:07:15 -0800
commit5b3533dc1d20a4946b19e379650c2faa5b88c9ec (patch)
tree3bc7b2357c9f22023f51c443d7d07fa87aa8fbf3 /git-reset.html
parent616a76d3a7e606b4673a9657b203c03a152e7a63 (diff)
downloadgit-htmldocs-5b3533dc1d20a4946b19e379650c2faa5b88c9ec.tar.gz
Autogenerated HTML docs for v1.9.0-138-g2de34
Diffstat (limited to 'git-reset.html')
-rw-r--r--git-reset.html6
1 files changed, 4 insertions, 2 deletions
diff --git a/git-reset.html b/git-reset.html
index 1a2035482..d6138c1ab 100644
--- a/git-reset.html
+++ b/git-reset.html
@@ -752,7 +752,7 @@ git-reset(1) Manual Page
<div class="verseblock">
<pre class="content"><em>git reset</em> [-q] [&lt;tree-ish&gt;] [--] &lt;paths&gt;&#8230;
<em>git reset</em> (--patch | -p) [&lt;tree-ish&gt;] [--] [&lt;paths&gt;&#8230;]
-<em>git reset</em> [--soft | --mixed | --hard | --merge | --keep] [-q] [&lt;commit&gt;]</pre>
+<em>git reset</em> [--soft | --mixed [-N] | --hard | --merge | --keep] [-q] [&lt;commit&gt;]</pre>
<div class="attribution">
</div></div>
</div>
@@ -829,6 +829,8 @@ section of <a href="git-add.html">git-add(1)</a> to learn how to operate the <tt
are preserved but not marked for commit) and reports what has not
been updated. This is the default action.
</p>
+<div class="paragraph"><p>If <tt>-N</tt> is specified, removed paths are marked as intent-to-add (see
+<a href="git-add.html">git-add(1)</a>).</p></div>
</dd>
<dt class="hdlist1">
--hard
@@ -1352,7 +1354,7 @@ entries:</p></div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-08-20 08:40:27 PDT
+Last updated 2014-02-27 15:06:29 PST
</div>
</div>
</body>