Merge branch 'jh/maint-do-not-track-non-branches'
authorJunio C Hamano <gitster@pobox.com>
Tue, 15 Mar 2011 21:22:13 +0000 (14:22 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 15 Mar 2011 21:22:13 +0000 (14:22 -0700)
commit663ee1a4c9b9caa4c8f446934410ca636f998df6
tree16709d531edb349a53910e3f7dd7c4a306b73cbb
parent936dfc220210bc00c7dc094250c9680620dab291
parent21b5b1e8dc9bed2b518defe29d69ebc27da4b68f
Merge branch 'jh/maint-do-not-track-non-branches'

* jh/maint-do-not-track-non-branches:
  branch/checkout --track: Ensure that upstream branch is indeed a branch
branch.c
t/t3200-branch.sh
t/t6040-tracking-info.sh