diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-03-11 22:50:03 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-03-11 22:50:03 +0000 |
| commit | 0578b22ff8cda5310219423fe1d6255c903710e1 (patch) | |
| tree | 0020ad714b2c535a3c2634b2bd045344bd98a7ba /git-pull.html | |
| parent | bb34317b8b0b3c34f91f17697ad618fe19148f7b (diff) | |
| download | git-htmldocs-0578b22ff8cda5310219423fe1d6255c903710e1.tar.gz | |
Autogenerated HTML docs for v1.5.4.4-498-g5d92
Diffstat (limited to 'git-pull.html')
| -rw-r--r-- | git-pull.html | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/git-pull.html b/git-pull.html index e6d2f821f..b4954e43f 100644 --- a/git-pull.html +++ b/git-pull.html @@ -282,6 +282,8 @@ With <tt>--rebase</tt>, calls <tt>git-rebase</tt> instead of <tt>git-merge</tt>. <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>
+<p>Also note that options meant for <tt>git-pull</tt> itself and underlying
+<tt>git-merge</tt> must be given before the options meant for <tt>git-fetch</tt>.</p>
</div>
<h2>OPTIONS</h2>
<div class="sectionbody">
@@ -991,7 +993,7 @@ Junio C Hamano and the git-list <git@vger.kernel.org>.</p> </div>
<div id="footer">
<div id="footer-text">
-Last updated 28-Feb-2008 00:25:43 UTC
+Last updated 11-Mar-2008 22:49:45 UTC
</div>
</div>
</body>
|