diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-09-06 13:37:23 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-09-06 13:37:23 +0900 |
| commit | bc39b7db11be3ba4e93e34f706b8a774e523bf1b (patch) | |
| tree | 5cc93fd82c98e8e5ccea9ab99111fd049c318d13 /git-branch.txt | |
| parent | fb1fdf1f6a77bd1efab252589905f85f760611ab (diff) | |
| download | git-htmldocs-bc39b7db11be3ba4e93e34f706b8a774e523bf1b.tar.gz | |
Autogenerated HTML docs for v2.14.1-473-g3ec7d
Diffstat (limited to 'git-branch.txt')
| -rw-r--r-- | git-branch.txt | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/git-branch.txt b/git-branch.txt index d0b335877..e292737b9 100644 --- a/git-branch.txt +++ b/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>:: |