Autogenerated HTML docs for v1.5.4.3-325-g6d21

1 files changed, 16 insertions, 18 deletions

diff --git a/git-branch.html b/git-branch.html
index 227436d9c..6e1bc8bd0 100644
--- a/git-branch.html
+++ b/git-branch.html
@@ -297,11 +297,10 @@ equal to that of the currently checked out branch.</p>
 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 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 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>

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

+the remote branch. This behavior may be changed via 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

 &lt;newbranch&gt;, and a reflog entry is created to remember the branch

@@ -433,14 +432,16 @@ clean up all obsolete remote-tracking branches.</p>
 </dt>

 <dd>

 <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.

-        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>--no-track</em> were given.

+        When creating a new branch, set up configuration so that git-pull

+        will automatically retrieve data from the start point, which must be

+        a branch. Use this if you always pull from the same upstream branch

+        into the new branch, and if you don't want to use "git pull

+        &lt;repository&gt; &lt;refspec&gt;" explicitly. This behavior is the default

+        when the start point is a remote branch. Set the

+        branch.autosetupmerge configuration variable to <tt>false</tt> if you want

+        git-checkout and git-branch to always behave as if <em>--no-track</em> were

+        given. Set it to <tt>always</tt> if you want this behavior when the

+        start-point is either a local or remote branch.

 </p>

 </dd>

 <dt>

@@ -448,10 +449,7 @@ clean up all obsolete remote-tracking branches.</p>
 </dt>

 <dd>

 <p>

-        When a branch is created off a remote branch,

-        set up configuration so that git-pull will not retrieve data

-        from the remote branch, ignoring the branch.autosetupmerge

-        configuration variable.

+        Ignore the branch.autosetupmerge configuration variable.

 </p>

 </dd>

 <dt>

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

 <div id="footer">

 <div id="footer-text">

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

+Last updated 28-Feb-2008 00:25:37 UTC

 </div>

 </div>

 </body>