Andrew's git / gitweb.git / diff
?
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)
* jh/maint-do-not-track-non-branches:
branch/checkout --track: Ensure that upstream branch is indeed a branch

1  2 
branch.c patch | diff1 | diff2 | blob | history
t/t3200-branch.sh patch | diff1 | diff2 | blob | history
t/t6040-tracking-info.sh patch | diff1 | diff2 | blob | history
diff --cc branch.c
Simple merge
diff --cc t/t3200-branch.sh
Simple merge
diff --cc t/t6040-tracking-info.sh
Simple merge