Autogenerated HTML docs for v1.5.0.3-438-gc49b2

1 files changed, 8 insertions, 2 deletions

diff --git a/git-branch.html b/git-branch.html
index 937b288d1..bd07c6531 100644
--- a/git-branch.html
+++ b/git-branch.html
@@ -275,7 +275,7 @@ git-branch(1) Manual Page
 <div class="verseblock">

 <div class="content"><em>git-branch</em> [--color | --no-color] [-r | -a]

            [-v [--abbrev=&lt;length&gt; | --no-abbrev]]

-<em>git-branch</em> [-l] [-f] &lt;branchname&gt; [&lt;start-point&gt;]

+<em>git-branch</em> [--track | --no-track] [-l] [-f] &lt;branchname&gt; [&lt;start-point&gt;]

 <em>git-branch</em> (-m | -M) [&lt;oldbranch&gt;] &lt;newbranch&gt;

 <em>git-branch</em> (-d | -D) [-r] &lt;branchname&gt;&#8230;</div></div>

 </div>

@@ -289,6 +289,12 @@ and option <tt>-a</tt> shows both.</p>
 It will start out with a head equal to the one given as &lt;start-point&gt;.

 If no &lt;start-point&gt; is given, the branch will be created with a head

 equal to that of the currently checked out branch.</p>

+<p>When a local branch is started off a remote branch, git can setup 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>

+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

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

 <div id="footer">

 <div id="footer-text">

-Last updated 03-Mar-2007 05:18:14 UTC

+Last updated 14-Mar-2007 11:19:09 UTC

 </div>

 </div>

 </body>