Merge branch 'jh/maint-do-not-track-non-branches' into next
commit13a93287e775be99624f90a9147975e7500bb893
authorJunio C Hamano <gitster@pobox.com>
Thu, 10 Mar 2011 00:38:58 +0000 (9 16:38 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 Mar 2011 00:38:58 +0000 (9 16:38 -0800)
treeca530334d74230a590ed7c0504bfaa9f0beacc16
parentdf1943a03a2b6af9833774929f80d7e17314ad89
parent21b5b1e8dc9bed2b518defe29d69ebc27da4b68f
Merge branch 'jh/maint-do-not-track-non-branches' into next

* 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