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