From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 6 Sep 2017 04:11:24 +0000 (+0900)
Subject: Merge branch 'ks/branch-set-upstream'
X-Git-Tag: v2.15.0-rc0~112
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/1fb77b3ee5417e7b6af782e43c8b98256861cca5?ds=inline;hp=-c

Merge branch 'ks/branch-set-upstream'

"branch --set-upstream" that has been deprecated in Git 1.8 has
finally been retired.

* ks/branch-set-upstream:
branch: quote branch/ref names to improve readability
builtin/branch: stop supporting the "--set-upstream" option
t3200: cleanup cruft of a test
---

1fb77b3ee5417e7b6af782e43c8b98256861cca5
diff --combined Documentation/git-branch.txt
index d0b3358771,ba805749ec..e292737b9c
--- a/Documentation/git-branch.txt
+++ b/Documentation/git-branch.txt
@@@ -195,10 -195,8 +195,8 @@@ start-point is either a local or remote
  	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>::
@@@ -267,8 -265,8 +265,8 @@@
  	Only list branches of the given object.
  
  --format <format>::
 -	A string that interpolates `%(fieldname)` from the object
 -	pointed at by a ref being shown.  The format is the same as
 +	A string that interpolates `%(fieldname)` from a branch ref being shown
 +	and the object it points at.  The format is the same as
  	that of linkgit:git-for-each-ref[1].
  
  Examples