summaryrefslogtreecommitdiffstats
path: root/git-branch.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-12-06 10:04:01 -0800
committerJunio C Hamano <gitster@pobox.com>2017-12-06 10:04:01 -0800
commit912712bb106faf8773bffb94876a77a2986f0be0 (patch)
tree0c665af963ce1561066812ee9b127bbbeea8c63b /git-branch.html
parent7da67f7dfd2371f3a505c40bf8f4ed1f2fc6cb9c (diff)
downloadgit-htmldocs-912712bb106faf8773bffb94876a77a2986f0be0.tar.gz
Autogenerated HTML docs for v2.15.1-354-g95ec6
Diffstat (limited to 'git-branch.html')
-rw-r--r--git-branch.html6
1 files changed, 3 insertions, 3 deletions
diff --git a/git-branch.html b/git-branch.html
index cd591238d..942495d0f 100644
--- a/git-branch.html
+++ b/git-branch.html
@@ -754,7 +754,7 @@ git-branch(1) Manual Page
[(--merged | --no-merged) [&lt;commit&gt;]]
[--contains [&lt;commit]] [--no-contains [&lt;commit&gt;]]
[--points-at &lt;object&gt;] [--format=&lt;format&gt;] [&lt;pattern&gt;&#8230;]
-<em>git branch</em> [--set-upstream | --track | --no-track] [-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> (--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;
@@ -829,7 +829,7 @@ way to clean up all obsolete remote-tracking branches.</p></div>
<p>
Delete a branch. The branch must be fully merged in its
upstream branch, or in <code>HEAD</code> if no upstream was set with
- <code>--track</code> or <code>--set-upstream</code>.
+ <code>--track</code> or <code>--set-upstream-to</code>.
</p>
</dd>
<dt class="hdlist1">
@@ -1344,7 +1344,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 2017-11-29 10:12:33 JST
+Last updated 2017-12-06 10:03:34 PST
</div>
</div>
</body>