summaryrefslogtreecommitdiffstats
path: root/git-pull.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-06-24 14:12:12 -0700
committerJunio C Hamano <gitster@pobox.com>2015-06-24 14:12:12 -0700
commitdf5384b09870c6ffdd80c620caa066b2f997ca20 (patch)
tree61869c4e003760c97119d79b09aaf8ff3eda50bf /git-pull.html
parentce447ab917ea7f6b852fee7dfb18e4b24acc6bef (diff)
downloadgit-htmldocs-df5384b09870c6ffdd80c620caa066b2f997ca20.tar.gz
Autogenerated HTML docs for v2.4.4-488-gdf97e
Diffstat (limited to 'git-pull.html')
-rw-r--r--git-pull.html4
1 files changed, 1 insertions, 3 deletions
diff --git a/git-pull.html b/git-pull.html
index 2b1a6c7f2..5e1bf4faf 100644
--- a/git-pull.html
+++ b/git-pull.html
@@ -808,8 +808,6 @@ pulling or stash them away with <a href="git-stash.html">git-stash(1)</a>.</p></
<div class="sect1">
<h2 id="_options">OPTIONS</h2>
<div class="sectionbody">
-<div class="paragraph"><p>Options meant for <em>git pull</em> itself and the underlying <em>git merge</em>
-must be given before the options meant for <em>git fetch</em>.</p></div>
<div class="dlist"><dl>
<dt class="hdlist1">
-q
@@ -1847,7 +1845,7 @@ version.</p></div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2015-03-28 11:17:28 PDT
+Last updated 2015-06-24 14:09:45 PDT
</div>
</div>
</body>