Merge branch 'js/branch-track-inherit'

"git branch -h" incorrectly said "--track[=direct|inherit]",
implying that "--trackinherit" is a valid option, which has been
corrected.
source: <redacted>
source: <redacted>

* js/branch-track-inherit:
  branch,checkout: fix --track documentation

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

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

diff --cc builtin/branch.c
Simple merge

diff --cc builtin/checkout.c
Simple merge