diff options
| author | Junio C Hamano <junio@kernel.org> | 2010-12-13 08:31:58 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2010-12-13 08:31:58 +0000 |
| commit | eef01fe919cb245838e4f4ad512a66202747742e (patch) | |
| tree | 02c72b987c74aadbce61763a2e2772bde48b416a /git-pull.html | |
| parent | cf29d337e34d752e5b61fc6629294eccc3ff6ef3 (diff) | |
| download | git-htmldocs-eef01fe919cb245838e4f4ad512a66202747742e.tar.gz | |
Autogenerated HTML docs for v1.7.3.3-557-gb5c17
Diffstat (limited to 'git-pull.html')
| -rw-r--r-- | git-pull.html | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/git-pull.html b/git-pull.html index 8df1efc11..bc5023058 100644 --- a/git-pull.html +++ b/git-pull.html @@ -662,8 +662,9 @@ 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> 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="paragraph"><p>See <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">
<table><tr>
<td class="icon">
@@ -1413,7 +1414,7 @@ Junio C Hamano and the git-list <<a href="mailto:git@vger.kernel.org">git@vge </div>
<div id="footer">
<div id="footer-text">
-Last updated 2010-12-05 06:20:21 UTC
+Last updated 2010-12-13 08:31:26 UTC
</div>
</div>
</body>
|