Autogenerated HTML docs for v2.3.4-263-gf53fc

1 files changed, 3 insertions, 3 deletions

diff --git a/git-pull.html b/git-pull.html
index 5bcacfb0f..20eaa0856 100644
--- a/git-pull.html
+++ b/git-pull.html
@@ -1041,7 +1041,7 @@ option can be used to override --squash.</p></div>
 branch, but pass <code>--preserve-merges</code> along to <code>git rebase</code> so that

 locally created merge commits will not be flattened.</p></div>

 <div class="paragraph"><p>When false, merge the current branch into the upstream branch.</p></div>

-<div class="paragraph"><p>See <code>pull.rebase</code>, <code>branch.&lt;name&gt;.rebase</code> and <code>branch.autosetuprebase</code> in

+<div class="paragraph"><p>See <code>pull.rebase</code>, <code>branch.&lt;name&gt;.rebase</code> and <code>branch.autoSetupRebase</code> in

 <a href="git-config.html">git-config(1)</a> if you want to make <code>git pull</code> always use

 <code>--rebase</code> instead of merging.</p></div>

 <div class="admonitionblock">

@@ -1158,7 +1158,7 @@ the current repository has the same history as the source repository.</p></div>
         By default, tags that point at objects that are downloaded

         from the remote repository are fetched and stored locally.

         This option disables this automatic tag following. The default

-        behavior for a remote may be specified with the remote.&lt;name&gt;.tagopt

+        behavior for a remote may be specified with the remote.&lt;name&gt;.tagOpt

         setting. See <a href="git-config.html">git-config(1)</a>.

 </p>

 </dd>

@@ -1848,7 +1848,7 @@ version.</p></div>
 <div id="footnotes"><hr /></div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2014-01-27 13:30:07 PST

+Last updated 2015-03-23 14:31:16 PDT

 </div>

 </div>

 </body>