Merge branch 'jk/cobdoc'

* jk/cobdoc: docs/checkout: clarify what "non-branch" means doc/checkout: split checkout and branch creation in synopsis doc/checkout: refer to git-branch(1) as appropriate doc: refer to tracking configuration as "upstream" doc: clarify --no-track option