Re: [PATCH v4 2/3] builtin/branch: stop supporting the use of --set-upstream option
From: Junio C Hamano <hidden>
Date: 2017-08-17 19:59:05
Kaartic Sivaraam [off-list ref] writes:
quoted hunk
diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt index 81bd0a7b7..948d9c9ef 100644 --- a/Documentation/git-branch.txt +++ b/Documentation/git-branch.txt@@ -195,10 +195,10 @@ 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's no longer supported. Please use + --track or --set-upstream-to instead. ++ +Note: This could possibly become an alias of --set-upstream-to in the future.
I'll tweak `--track` and `--set-upstream-to` in the updated text and remove the 'Note:' thing that does not give any useful information to the end users while queuing (no need to resend). Thanks.