Merge branch 'mg/tracked-local-branches'
commitccc852c37751c7bc8f81bfb71e6722291270bca5
authorJunio C Hamano <gitster@pobox.com>
Mon, 6 Apr 2009 07:42:31 +0000 (6 00:42 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 6 Apr 2009 07:42:31 +0000 (6 00:42 -0700)
tree8c4ff38a86383bba8d178fed191b2ebc521e91d6
parent87d2062b3984af5347519c38877b99bce06e6e8d
parent5e6e2b487e76066d03b4f5809dc6b44b1234519a
Merge branch 'mg/tracked-local-branches'

* mg/tracked-local-branches:
  Make local branches behave like remote branches when --tracked
  Test for local branches being followed with --track
remote.c