From: Todd Zullinger Date: Thu, 16 Nov 2017 07:46:43 GMT Subject: [PATCH] branch doc: remove --set-upstream from synopsis Message-ID: <20171116074643.19614-1-tmz@pobox.com> Support for the --set-upstream option was removed in 52668846ea (builtin/branch: stop supporting the "--set-upstream" option, 2017-08-17), after a long deprecation period. Remove the option from the command synopsis for consistency. Replace another reference to it in the description of `--delete` with `--set-upstream-to`. Signed-off-by: Todd Zullinger --- I noticed that --set-upstream was still in the synopsis for git branch. I don't think it was left there intentionally. I looked through the thread where support for the option was removed and didn't notice any comments suggesting otherwise[1]. With luck, I didn't miss the obvious while reading the thread. [1] https://public-inbox.org/git/20170807143938.5127-1-kaarticsivaraam91196@gmail.com/ Documentation/git-branch.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt index d6587c5e96..159ca388f1 100644 --- a/Documentation/git-branch.txt +++ b/Documentation/git-branch.txt @@ -14,7 +14,7 @@ SYNOPSIS [(--merged | --no-merged) []] [--contains []] [--points-at ] [--format=] [...] -'git branch' [--set-upstream | --track | --no-track] [-l] [-f] [] +'git branch' [--track | --no-track] [-l] [-f] [] 'git branch' (--set-upstream-to= | -u ) [] 'git branch' --unset-upstream [] 'git branch' (-m | -M) [] @@ -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`. -- 2.15.0