diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-02-20 10:44:26 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-02-20 10:44:26 +0000 |
| commit | 6d559fc736bece9bac0d731b496639cbfe9ef757 (patch) | |
| tree | 8a7cc77ae892f0ec22f260edc8bd452f06390d48 /git-pull.html | |
| parent | e670d0d6241cf484903e1d98bf786b58657c98e2 (diff) | |
| download | git-htmldocs-6d559fc736bece9bac0d731b496639cbfe9ef757.tar.gz | |
Autogenerated HTML docs for v1.5.4.2-156-ge3c5
Diffstat (limited to 'git-pull.html')
| -rw-r--r-- | git-pull.html | 53 |
1 files changed, 28 insertions, 25 deletions
diff --git a/git-pull.html b/git-pull.html index 8f555da6c..0cc70849b 100644 --- a/git-pull.html +++ b/git-pull.html @@ -277,7 +277,8 @@ git-pull(1) Manual Page <h2>DESCRIPTION</h2>
<div class="sectionbody">
<p>Runs <tt>git-fetch</tt> with the given parameters, and calls <tt>git-merge</tt>
-to merge the retrieved head(s) into the current branch.</p>
+to merge the retrieved head(s) into the current branch.
+With <tt>--rebase</tt>, calls <tt>git-rebase</tt> instead of <tt>git-merge</tt>.</p>
<p>Note that you can use <tt>.</tt> (current directory) as the
<repository> to pull from the local repository — this is useful
when merging local branches into the current branch.</p>
@@ -378,6 +379,31 @@ when merging local branches into the current branch.</p> </dl>
<dl>
<dt>
+--rebase
+</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>
+<p><strong>NOTE:</strong> This is a potentially _dangerous_ mode of operation.
+It rewrites history, which does not bode well when you
+published that history already. Do <strong>not</strong> use this option
+unless you have read <a href="git-rebase.html">git-rebase(1)</a> carefully.</p>
+</dd>
+<dt>
+--no-rebase
+</dt>
+<dd>
+<p>
+ Override earlier --rebase.
+</p>
+</dd>
+<dt>
-q, --quiet
</dt>
<dd>
@@ -785,29 +811,6 @@ ours branches.
</p>
</dd>
-<dt>
---rebase
-</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.
-</p>
-<p><strong>NOTE:</strong> This is a potentially _dangerous_ mode of operation.
-It rewrites history, which does not bode well when you
-published that history already. Do <strong>not</strong> use this option
-unless you have read <a href="git-rebase.html">git-rebase(1)</a> carefully.</p>
-</dd>
-<dt>
---no-rebase
-</dt>
-<dd>
-<p>
- Override earlier --rebase.
-</p>
-</dd>
</dl>
</div>
<h2>DEFAULT BEHAVIOUR</h2>
@@ -970,7 +973,7 @@ Junio C Hamano and the git-list <git@vger.kernel.org>.</p> </div>
<div id="footer">
<div id="footer-text">
-Last updated 12-Feb-2008 03:18:05 UTC
+Last updated 20-Feb-2008 10:44:09 UTC
</div>
</div>
</body>
|