Merge branch 'tz/branch-doc-remove-set-upstream'
authorJunio C Hamano <gitster@pobox.com>
Wed, 6 Dec 2017 17:23:36 +0000 (09:23 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 6 Dec 2017 17:23:36 +0000 (09:23 -0800)
"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

1  2 
Documentation/git-branch.txt

Simple merge