summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-12-06 17:23:36 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-12-06 17:23:36 (GMT)
commit0186e9ebedfb18ad02fe20af18cc35526760fbad (patch)
tree532879bc9bfd11a60e32403a258cf8143f4e8d28
parent7102541ab853659e5282459a2be12c7feb27ff71 (diff)
parenta060f3d3d87d9dc1281000cf21a3dbaaa1327cc2 (diff)
downloadgit-0186e9ebedfb18ad02fe20af18cc35526760fbad.zip
git-0186e9ebedfb18ad02fe20af18cc35526760fbad.tar.gz
git-0186e9ebedfb18ad02fe20af18cc35526760fbad.tar.bz2
Merge branch 'tz/branch-doc-remove-set-upstream'
"git branch --set-upstream" has been deprecated and (sort of) removed, as "--set-upstream-to" is the preferred one these days. The documentation still had "--set-upstream" listed on its synopsys section, which has been corrected. * tz/branch-doc-remove-set-upstream: branch doc: remove --set-upstream from synopsis
-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 520c53b..b3084c9 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>
@@ -86,7 +86,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`.