summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorTodd Zullinger <tmz@pobox.com>2017-11-16 07:46:43 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-11-17 01:19:21 (GMT)
commita060f3d3d87d9dc1281000cf21a3dbaaa1327cc2 (patch)
tree51ba96a79e9c6440dbd0e6e30952ae89fa30eb21 /Documentation
parent52668846ea2d41ffbd87cda7cb8e492dea9f2c4d (diff)
downloadgit-a060f3d3d87d9dc1281000cf21a3dbaaa1327cc2.zip
git-a060f3d3d87d9dc1281000cf21a3dbaaa1327cc2.tar.gz
git-a060f3d3d87d9dc1281000cf21a3dbaaa1327cc2.tar.bz2
branch doc: remove --set-upstream from synopsis
Support for the --set-upstream option was removed in 52668846ea (builtin/branch: stop supporting the "--set-upstream" option, 2017-08-17), after a long deprecation period. Remove the option from the command synopsis for consistency. Replace another reference to it in the description of `--delete` with `--set-upstream-to`. Signed-off-by: Todd Zullinger <tmz@pobox.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-branch.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index ba80574..de90fde 100644
--- a/Documentation/git-branch.txt
+++ b/Documentation/git-branch.txt
@@ -14,7 +14,7 @@ SYNOPSIS
[(--merged | --no-merged) [<commit>]]
[--contains [<commit]] [--no-contains [<commit>]]
[--points-at <object>] [--format=<format>] [<pattern>...]
-'git branch' [--set-upstream | --track | --no-track] [-l] [-f] <branchname> [<start-point>]
+'git branch' [--track | --no-track] [-l] [-f] <branchname> [<start-point>]
'git branch' (--set-upstream-to=<upstream> | -u <upstream>) [<branchname>]
'git branch' --unset-upstream [<branchname>]
'git branch' (-m | -M) [<oldbranch>] <newbranch>
@@ -81,7 +81,7 @@ OPTIONS
--delete::
Delete a branch. The branch must be fully merged in its
upstream branch, or in `HEAD` if no upstream was set with
- `--track` or `--set-upstream`.
+ `--track` or `--set-upstream-to`.
-D::
Shortcut for `--delete --force`.