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>
Todd Zullinger committed
Nov 16, 2017 at 02:46 UTC
a060f3d3d87d9dc1281000cf21a3dbaaa1327cc2
1 file changed
+2
-2
Documentation/git-branch.txt
+2
-2
@@ -14,7 +14,7 @@ SYNOPSIS
14
[(--merged | --no-merged) [<commit>]]
15
[--contains [<commit]] [--no-contains [<commit>]]
16
[--points-at <object>] [--format=<format>] [<pattern>...]
17
-'git branch' [--set-upstream | --track | --no-track] [-l] [-f] <branchname> [<start-point>]
17
+'git branch' [--track | --no-track] [-l] [-f] <branchname> [<start-point>]
18
'git branch' (--set-upstream-to=<upstream> | -u <upstream>) [<branchname>]
19
'git branch' --unset-upstream [<branchname>]
20
'git branch' (-m | -M) [<oldbranch>] <newbranch>
@@ -81,7 +81,7 @@ OPTIONS
81
--delete::
82
Delete a branch. The branch must be fully merged in its
83
upstream branch, or in `HEAD` if no upstream was set with
84
- `--track` or `--set-upstream`.
84
+ `--track` or `--set-upstream-to`.
85
86
-D::
87
Shortcut for `--delete --force`.