summaryrefslogtreecommitdiffstats
path: root/git.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-07-12 15:47:46 -0700
committerJunio C Hamano <gitster@pobox.com>2013-07-12 15:47:46 -0700
commit8401f142a88980c91f3af6f06199e5579c9143c6 (patch)
tree3bce834aaee41a0b122eb45ab2ce5fb26a747df8 /git.html
parent5865559b9be66a59108c9f38b1e9f4d91201ebc6 (diff)
downloadgit-htmldocs-8401f142a88980c91f3af6f06199e5579c9143c6.tar.gz
Autogenerated HTML docs for v1.8.3.2-804-g0da7a
Diffstat (limited to 'git.html')
-rw-r--r--git.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/git.html b/git.html
index cc721ba9f..af3d7c61c 100644
--- a/git.html
+++ b/git.html
@@ -1148,7 +1148,7 @@ ancillary user utilities.</p></div>
</dt>
<dd>
<p>
- Fetch from and merge with another repository or a local branch.
+ Fetch from and integrate with another repository or a local branch.
</p>
</dd>
<dt class="hdlist1">
@@ -2765,7 +2765,7 @@ subscribed to the list to send a message there.</p></div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-06-20 16:38:52 PDT
+Last updated 2013-06-28 15:14:40 PDT
</div>
</div>
</body>