From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 6 Dec 2017 17:23:36 +0000 (-0800)
Subject: Merge branch 'tz/branch-doc-remove-set-upstream'
X-Git-Tag: v2.16.0-rc0~82
X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/0186e9ebedfb18ad02fe20af18cc35526760fbad?hp=7102541ab853659e5282459a2be12c7feb27ff71

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

"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
---

diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index 520c53b5e8..b3084c99c1 100644
--- a/Documentation/git-branch.txt
+++ b/Documentation/git-branch.txt
@@ -14,7 +14,7 @@ SYNOPSIS
 	[(--merged | --no-merged) [<commit>]]
 	[--contains [<commit]] [--no-contains [<commit>]]
 	[--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' --unset-upstream [<branchname>]
 'git branch' (-m | -M) [<oldbranch>] <newbranch>
@@ -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`.