Autogenerated HTML docs for v1.5.4.1-97-g40aab

1 files changed, 9 insertions, 8 deletions

diff --git a/git-branch.html b/git-branch.html
index d8d405cfd..227436d9c 100644
--- a/git-branch.html
+++ b/git-branch.html
@@ -296,11 +296,11 @@ equal to that of the currently checked out branch.</p>
 <p>Note that this will create the new branch, but it will not switch the

 working tree to it; use "git checkout &lt;newbranch&gt;" to switch to the

 new branch.</p>

-<p>When a local branch is started off a remote branch, git can setup the

+<p>When a local branch is started off a remote branch, git sets up the

 branch so that <a href="git-pull.html">git-pull(1)</a> will appropriately merge from that

-remote branch.  If this behavior is desired, it is possible to make it

-the default using the global <tt>branch.autosetupmerge</tt> configuration

-flag.  Otherwise, it can be chosen per-branch using the <tt>--track</tt>

+remote branch.  If this behavior is not desired, it is possible to

+disable it using the global <tt>branch.autosetupmerge</tt> configuration

+flag.  That setting can be overridden by using the <tt>--track</tt>

 and <tt>--no-track</tt> options.</p>

 <p>With a <em>-m</em> or <em>-M</em> option, &lt;oldbranch&gt; will be renamed to &lt;newbranch&gt;.

 If &lt;oldbranch&gt; had a corresponding reflog, it is renamed to match

@@ -436,10 +436,11 @@ clean up all obsolete remote-tracking branches.</p>
         Set up configuration so that git-pull will automatically

         retrieve data from the remote branch.  Use this if you always

         pull from the same remote branch into the new branch, or if you

-        don't want to use "git pull &lt;repository&gt; &lt;refspec&gt;" explicitly.  Set the

-        branch.autosetupmerge configuration variable to true if you

+        don't want to use "git pull &lt;repository&gt; &lt;refspec&gt;" explicitly.

+        This behavior is the default.  Set the

+        branch.autosetupmerge configuration variable to false if you

         want git-checkout and git-branch to always behave as if

-        <em>--track</em> were given.

+        <em>--no-track</em> were given.

 </p>

 </dd>

 <dt>

@@ -565,7 +566,7 @@ a branch and check it out with a single command.</p>
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 07-Jan-2008 07:50:03 UTC

+Last updated 12-Feb-2008 03:18:04 UTC

 </div>

 </div>

 </body>