summaryrefslogtreecommitdiff
path: root/Documentation/git-branch.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-09-06 04:11:24 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-09-06 04:11:24 (GMT)
commit1fb77b3ee5417e7b6af782e43c8b98256861cca5 (patch)
tree6ae1e846a596ca2ef177d1ce8f14578cee4ce90d /Documentation/git-branch.txt
parent238e487ea943f80734cc6dad665e7238b8cbc7ff (diff)
parent9c93ff7cc4b4b9f4b9c5769de6144fa81698796c (diff)
downloadgit-1fb77b3ee5417e7b6af782e43c8b98256861cca5.zip
git-1fb77b3ee5417e7b6af782e43c8b98256861cca5.tar.gz
git-1fb77b3ee5417e7b6af782e43c8b98256861cca5.tar.bz2
Merge branch 'ks/branch-set-upstream'
"branch --set-upstream" that has been deprecated in Git 1.8 has finally been retired. * ks/branch-set-upstream: branch: quote branch/ref names to improve readability builtin/branch: stop supporting the "--set-upstream" option t3200: cleanup cruft of a test
Diffstat (limited to 'Documentation/git-branch.txt')
-rw-r--r--Documentation/git-branch.txt6
1 files changed, 2 insertions, 4 deletions
diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index d0b3358..e292737 100644
--- a/Documentation/git-branch.txt
+++ b/Documentation/git-branch.txt
@@ -195,10 +195,8 @@ start-point is either a local or remote-tracking branch.
branch.autoSetupMerge configuration variable is true.
--set-upstream::
- If specified branch does not exist yet or if `--force` has been
- given, acts exactly like `--track`. Otherwise sets up configuration
- like `--track` would when creating the branch, except that where
- branch points to is not changed.
+ As this option had confusing syntax, it is no longer supported.
+ Please use `--track` or `--set-upstream-to` instead.
-u <upstream>::
--set-upstream-to=<upstream>::