Autogenerated HTML docs for v1.7.12-315-g682c

1 files changed, 26 insertions, 2 deletions

diff --git a/git-branch.html b/git-branch.html
index 11fe323e3..6047a7f26 100644
--- a/git-branch.html
+++ b/git-branch.html
@@ -588,6 +588,8 @@ git-branch(1) Manual Page
         [--column[=<options>] | --no-column]

         [(--merged | --no-merged | --contains) [<commit>]] [<pattern>…]

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

+<em>git branch</em> (--set-upstream-to=&lt;upstream&gt; | -u &lt;upstream&gt;) [&lt;branchname&gt;]

+<em>git branch</em> --unset-upstream [&lt;branchname&gt;]

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

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

 <em>git branch</em> --edit-description [&lt;branchname&gt;]</div>

@@ -620,7 +622,7 @@ branch so that <em>git pull</em> will appropriately merge from
 the remote-tracking 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, and

-changed later using <tt>git branch --set-upstream</tt>.</p></div>

+changed later using <tt>git branch --set-upstream-to</tt>.</p></div>

 <div class="paragraph"><p>With a <tt>-m</tt> or <tt>-M</tt> 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

@@ -856,6 +858,28 @@ start-point is either a local or remote-tracking branch.</p></div>
 </p>

 </dd>

 <dt class="hdlist1">

+-u &lt;upstream&gt;

+</dt>

+<dt class="hdlist1">

+--set-upstream-to=&lt;upstream&gt;

+</dt>

+<dd>

+<p>

+        Set up &lt;branchname&gt;'s tracking information so &lt;upstream&gt; is

+        considered &lt;branchname&gt;'s upstream branch. If no &lt;branchname&gt;

+        is specified, then it defaults to the current branch.

+</p>

+</dd>

+<dt class="hdlist1">

+--unset-upstream

+</dt>

+<dd>

+<p>

+        Remove the upstream information for &lt;branchname&gt;. If no branch

+        is specified it defaults to the current branch.

+</p>

+</dd>

+<dt class="hdlist1">

 --edit-description

 </dt>

 <dd>

@@ -1028,7 +1052,7 @@ a branch?&#8221;</a> in the Git User&#8217;s Manual.</p></div>
 <div id="footnotes"><hr /></div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2012-05-03 16:06:58 PDT

+Last updated 2012-09-10 16:26:53 PDT

 </div>

 </div>

 </body>