Merge branch 'ks/branch-set-upstream' into next
authorJunio C Hamano <gitster@pobox.com>
Tue, 22 Aug 2017 22:09:37 +0000 (15:09 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 22 Aug 2017 22:09:37 +0000 (15:09 -0700)
"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

1  2 
Documentation/git-branch.txt
Simple merge