summaryrefslogtreecommitdiffstats
path: root/git-pull.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-08-22 12:55:29 -0700
committerJunio C Hamano <gitster@pobox.com>2012-08-22 12:55:29 -0700
commitd031611b80058b4f2217d154bf060aff8f80038f (patch)
tree30b17343fd84968f8f46f779da427862db435ce2 /git-pull.html
parent0862f09cc973996f93b1254f944295e06d42822e (diff)
downloadgit-htmldocs-d031611b80058b4f2217d154bf060aff8f80038f.tar.gz
Autogenerated HTML docs for v1.7.12-70-g851f7
Diffstat (limited to 'git-pull.html')
-rw-r--r--git-pull.html5
1 files changed, 4 insertions, 1 deletions
diff --git a/git-pull.html b/git-pull.html
index 2ed02b37c..67565c948 100644
--- a/git-pull.html
+++ b/git-pull.html
@@ -877,6 +877,9 @@ option can be used to override --squash.</p></div>
</dl></div>
<div class="dlist"><dl>
<dt class="hdlist1">
+-r
+</dt>
+<dt class="hdlist1">
--rebase
</dt>
<dd>
@@ -1639,7 +1642,7 @@ version.</p></div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2012-05-02 15:00:44 PDT
+Last updated 2012-08-22 12:54:47 PDT
</div>
</div>
</body>