diff options
| author | Junio C Hamano <junio@kernel.org> | 2010-11-18 00:53:09 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2010-11-18 00:53:09 +0000 |
| commit | 982eb11dc5ca975628029adef95a96309ae25294 (patch) | |
| tree | d4bedc784e5b27293e50d6657b2171549f0be2d6 /git-pull.html | |
| parent | c3fda57fff8451d3c28afc16c6ace06cfd087981 (diff) | |
| download | git-htmldocs-982eb11dc5ca975628029adef95a96309ae25294.tar.gz | |
Autogenerated HTML docs for v1.7.3.2-245-g03276
Diffstat (limited to 'git-pull.html')
| -rw-r--r-- | git-pull.html | 35 |
1 files changed, 9 insertions, 26 deletions
diff --git a/git-pull.html b/git-pull.html index 57c918528..3093370d7 100644 --- a/git-pull.html +++ b/git-pull.html @@ -656,13 +656,14 @@ option can be used to override --squash.</p></div> </dt>
<dd>
<p>
- Instead of a merge, perform a rebase after fetching. If
- there is a remote ref for the upstream branch, and this branch
- was rebased since last fetched, the rebase uses that information
- to avoid rebasing non-local changes. To make this the default
- for branch <tt><name></tt>, set configuration <tt>branch.<name>.rebase</tt>
- to <tt>true</tt>.
-</p>
+ Rebase the current branch on top of the upstream branch after
+ fetching. If there is a remote-tracking branch corresponding to
+ the upstream branch and the upstream branch was rebased since last
+ 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="admonitionblock">
<table><tr>
<td class="icon">
@@ -756,24 +757,6 @@ unless you have read <a href="git-rebase.html">git-rebase(1)</a> carefully.</td> </p>
</dd>
<dt class="hdlist1">
--t
-</dt>
-<dt class="hdlist1">
---tags
-</dt>
-<dd>
-<p>
- Most of the tags are fetched automatically as branch
- heads are downloaded, but tags that do not point at
- objects reachable from the branch heads that are being
- tracked will not be fetched by this mechanism. This
- flag lets all tags and their associated objects be
- downloaded. The default behavior for a remote may be
- specified with the remote.<name>.tagopt setting. See
- <a href="git-config.html">git-config(1)</a>.
-</p>
-</dd>
-<dt class="hdlist1">
-u
</dt>
<dt class="hdlist1">
@@ -1430,7 +1413,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-08-13 02:46:17 UTC
+Last updated 2010-11-18 00:51:23 UTC
</div>
</div>
</body>
|