diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-09-06 06:11:24 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-09-06 06:11:24 +0200 |
| commit | 1fb77b3ee5417e7b6af782e43c8b98256861cca5 (patch) | |
| tree | 6ae1e846a596ca2ef177d1ce8f14578cee4ce90d /Documentation/git-branch.txt | |
| parent | The fifth batch post 2.14 (diff) | |
| parent | branch: quote branch/ref names to improve readability (diff) | |
| download | git-1fb77b3ee5417e7b6af782e43c8b98256861cca5.tar.xz git-1fb77b3ee5417e7b6af782e43c8b98256861cca5.zip | |
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.txt | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt index d0b3358771..e292737b9c 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>:: |