summaryrefslogtreecommitdiffstats
path: root/git-read-tree.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-read-tree.html
parent624dd4c072be7e13e57519eb729f35089386fec9 (diff)
downloadgit-htmldocs-d75148af8e54fe1d655796c75a601e5f79804808.tar.gz
Autogenerated HTML docs for v1.9.1-506-g7bf27
Diffstat (limited to 'git-read-tree.html')
-rw-r--r--git-read-tree.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-read-tree.html b/git-read-tree.html
index 071b737cb..26409e46d 100644
--- a/git-read-tree.html
+++ b/git-read-tree.html
@@ -828,7 +828,7 @@ will be in unmerged state when <em>git read-tree</em> returns.</p></div>
<dd>
<p>
Check if the command would error out, without updating the index
- nor the files in the working tree for real.
+ or the files in the working tree for real.
</p>
</dd>
<dt class="hdlist1">
@@ -1294,7 +1294,7 @@ support.</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-04-08 12:47:26 PDT
</div>
</div>
</body>