mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-12-01 05:54:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'tz/branch-doc-remove-set-upstream'

Browse Source 
"git branch --set-upstream" has been deprecated and (sort of)
removed, as "--set-upstream-to" is the preferred one these days.
The documentation still had "--set-upstream" listed on its
synopsys section, which has been corrected.

* tz/branch-doc-remove-set-upstream:
  branch doc: remove --set-upstream from synopsis
This commit is contained in:
Junio C Hamano 2017-12-06 09:23:36 -08:00
commit 0186e9ebed
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/git-branch.txt
View File

@ -14,7 +14,7 @@ SYNOPSIS
[(--merged | --no-merged) [<commit>]] [(--merged | --no-merged) [<commit>]]
[--contains [<commit]] [--no-contains [<commit>]] [--contains [<commit]] [--no-contains [<commit>]]
[--points-at <object>] [--format=<format>] [<pattern>...] [--points-at <object>] [--format=<format>] [<pattern>...]
'git branch' [--set-upstream | --track | --no-track] [-l] [-f] <branchname> [<start-point>] 'git branch' [--track | --no-track] [-l] [-f] <branchname> [<start-point>]
'git branch' (--set-upstream-to=<upstream> | -u <upstream>) [<branchname>] 'git branch' (--set-upstream-to=<upstream> | -u <upstream>) [<branchname>]
'git branch' --unset-upstream [<branchname>] 'git branch' --unset-upstream [<branchname>]
'git branch' (-m | -M) [<oldbranch>] <newbranch> 'git branch' (-m | -M) [<oldbranch>] <newbranch>
@ -86,7 +86,7 @@ OPTIONS
--delete:: --delete::
Delete a branch. The branch must be fully merged in its Delete a branch. The branch must be fully merged in its
upstream branch, or in `HEAD` if no upstream was set with upstream branch, or in `HEAD` if no upstream was set with
`--track` or `--set-upstream`. `--track` or `--set-upstream-to`.
-D:: -D::
Shortcut for `--delete --force`. Shortcut for `--delete --force`.