From: Junio C Hamano <junio@hera.kernel.org>
Date: Tue, 11 Mar 2008 22:50:03 +0000 (+0000)
Subject: Autogenerated HTML docs for v1.5.4.4-498-g5d92
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0578b22ff8cda5310219423fe1d6255c903710e1;p=git.git

Autogenerated HTML docs for v1.5.4.4-498-g5d92
---

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
 &lt;repository&gt; to pull from the local repository &#8212; 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 &lt;git@vger.kernel.org&gt;.</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>
diff --git a/git-pull.txt b/git-pull.txt
index 737894390..3405ca09e 100644
--- a/git-pull.txt
+++ b/git-pull.txt
@@ -21,6 +21,8 @@ Note that you can use `.` (current directory) as the
 <repository> to pull from the local repository -- this is useful
 when merging local branches into the current branch.
 
+Also note that options meant for `git-pull` itself and underlying
+`git-merge` must be given before the options meant for `git-fetch`.
 
 OPTIONS
 -------
diff --git a/git-rebase.html b/git-rebase.html
index bdc1516cf..df59b6485 100644
--- a/git-rebase.html
+++ b/git-rebase.html
@@ -631,8 +631,7 @@ you share.</p>
 hook if one exists.  You can use this hook to do sanity checks and
 reject the rebase if it isn't appropriate.  Please see the template
 pre-rebase hook script for an example.</p>
-<p>You must be in the top directory of your project to start (or continue)
-a rebase.  Upon completion, &lt;branch&gt; will be the current branch.</p>
+<p>Upon completion, &lt;branch&gt; will be the current branch.</p>
 </div>
 <h2>INTERACTIVE MODE</h2>
 <div class="sectionbody">
@@ -832,7 +831,7 @@ Johannes E. Schindelin &lt;johannes.schindelin@gmx.de&gt;</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 03-Mar-2008 01:59:59 UTC
+Last updated 11-Mar-2008 22:49:45 UTC
 </div>
 </div>
 </body>
diff --git a/git-rebase.txt b/git-rebase.txt
index 4b1030474..e0412e086 100644
--- a/git-rebase.txt
+++ b/git-rebase.txt
@@ -262,8 +262,7 @@ hook if one exists.  You can use this hook to do sanity checks and
 reject the rebase if it isn't appropriate.  Please see the template
 pre-rebase hook script for an example.
 
-You must be in the top directory of your project to start (or continue)
-a rebase.  Upon completion, <branch> will be the current branch.
+Upon completion, <branch> will be the current branch.
 
 INTERACTIVE MODE
 ----------------