Merge branch 'js/branch-track-inherit' into gc/branch-recurse-submodules

* js/branch-track-inherit:
  branch,checkout: fix --track documentation
  branch,checkout: fix --track usage strings
  config: require lowercase for branch.*.autosetupmerge
  branch: add flags and config to inherit tracking
  branch: accept multiple upstream branches for tracking

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

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

diff --cc builtin/branch.c
Simple merge

diff --cc config.c
Simple merge

diff --cc parse-options.h
Simple merge

diff --cc t/t3200-branch.sh
Simple merge