Merge branch 'il/branch-set-upstream'

* il/branch-set-upstream:
  branch: warn and refuse to set a branch as a tracking branch of itself.
  Add branch --set-upstream

diff --cc Documentation/git-branch.txt
Simple merge

diff --cc cache.h
Simple merge