diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-12-06 10:04:01 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-12-06 10:04:01 -0800 |
commit | 912712bb106faf8773bffb94876a77a2986f0be0 (patch) | |
tree | 0c665af963ce1561066812ee9b127bbbeea8c63b /git-branch.html | |
parent | 7da67f7dfd2371f3a505c40bf8f4ed1f2fc6cb9c (diff) | |
download | git-htmldocs-912712bb106faf8773bffb94876a77a2986f0be0.tar.gz |
Autogenerated HTML docs for v2.15.1-354-g95ec6
Diffstat (limited to 'git-branch.html')
-rw-r--r-- | git-branch.html | 6 |
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) [<commit>]]
[--contains [<commit]] [--no-contains [<commit>]]
[--points-at <object>] [--format=<format>] [<pattern>…]
-<em>git branch</em> [--set-upstream | --track | --no-track] [-l] [-f] <branchname> [<start-point>]
+<em>git branch</em> [--track | --no-track] [-l] [-f] <branchname> [<start-point>]
<em>git branch</em> (--set-upstream-to=<upstream> | -u <upstream>) [<branchname>]
<em>git branch</em> --unset-upstream [<branchname>]
<em>git branch</em> (-m | -M) [<oldbranch>] <newbranch>
@@ -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?”</a> in the Git User’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>
|