summaryrefslogtreecommitdiffstats
path: root/git-reset.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-04-08 12:48:38 -0700
committerJunio C Hamano <gitster@pobox.com>2014-04-08 12:48:38 -0700
commitd75148af8e54fe1d655796c75a601e5f79804808 (patch)
tree1aed2433cb2e2d7db853a72387f48ec081ce01dc /git-reset.html
parent624dd4c072be7e13e57519eb729f35089386fec9 (diff)
downloadgit-htmldocs-d75148af8e54fe1d655796c75a601e5f79804808.tar.gz
Autogenerated HTML docs for v1.9.1-506-g7bf27
Diffstat (limited to 'git-reset.html')
-rw-r--r--git-reset.html8
1 files changed, 4 insertions, 4 deletions
diff --git a/git-reset.html b/git-reset.html
index d6138c1ab..96f4bb0fb 100644
--- a/git-reset.html
+++ b/git-reset.html
@@ -771,7 +771,7 @@ to HEAD in all forms.</p></div>
<dd>
<p>
This form resets the index entries for all &lt;paths&gt; to their
- state at &lt;tree-ish&gt;. (It does not affect the working tree, nor
+ state at &lt;tree-ish&gt;. (It does not affect the working tree or
the current branch.)
</p>
<div class="paragraph"><p>This means that <tt>git reset &lt;paths&gt;</tt> is the opposite of <tt>git add
@@ -814,7 +814,7 @@ section of <a href="git-add.html">git-add(1)</a> to learn how to operate the <tt
</dt>
<dd>
<p>
- Does not touch the index file nor the working tree at all (but
+ Does not touch the index file or the working tree at all (but
resets the head to &lt;commit&gt;, just like all modes do). This leaves
all your changed files "Changes to be committed", as <em>git status</em>
would put it.
@@ -927,7 +927,7 @@ Somebody asks you to pull, and the changes sounds worthy of merging.
<p>
However, you already dirtied the index (i.e. your index does
not match the HEAD commit). But you know the pull you are going
-to make does not affect frotz.c nor filfre.c, so you revert the
+to make does not affect frotz.c or filfre.c, so you revert the
index changes for these two files. Your changes in working tree
remain there.
</p>
@@ -1354,7 +1354,7 @@ entries:</p></div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2014-02-27 15:06:29 PST
+Last updated 2014-04-08 12:47:26 PDT
</div>
</div>
</body>