Merge branch 'jk/cobdoc'
authorJunio C Hamano <gitster@pobox.com>
Sat, 18 Apr 2009 04:42:13 +0000 (21:42 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 18 Apr 2009 04:42:13 +0000 (21:42 -0700)
* 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

Trivial merge