diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-12-09 15:41:20 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-09 15:41:20 -0800 |
| commit | 515ab1d542801aea6a6119c0391ef91dbc9e9de9 (patch) | |
| tree | cfcad3b4d1f63c5d1c5c8752e507cc4f9db59207 /git-pull.html | |
| parent | 92887a3ed176ab77bfc12e91914f1cdd99e591d6 (diff) | |
| download | git-htmldocs-515ab1d542801aea6a6119c0391ef91dbc9e9de9.tar.gz | |
Autogenerated HTML docs for v1.7.8-163-g9859a
Diffstat (limited to 'git-pull.html')
| -rw-r--r-- | git-pull.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-pull.html b/git-pull.html index a4cc0dd5f..9a634abd6 100644 --- a/git-pull.html +++ b/git-pull.html @@ -873,7 +873,7 @@ option can be used to override --squash.</p></div> fetched, the rebase uses that information to avoid rebasing
non-local changes.
</p>
-<div class="paragraph"><p>See <tt>branch.<name>.rebase</tt> and <tt>branch.autosetuprebase</tt> in
+<div class="paragraph"><p>See <tt>pull.rebase</tt>, <tt>branch.<name>.rebase</tt> and <tt>branch.autosetuprebase</tt> in
<a href="git-config.html">git-config(1)</a> if you want to make <tt>git pull</tt> always use
<tt>--rebase</tt> instead of merging.</p></div>
<div class="admonitionblock">
@@ -1625,7 +1625,7 @@ version.</p></div> <div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2011-11-15 13:45:02 PDT
+Last updated 2011-12-09 15:40:58 PDT
</div>
</div>
</body>
|