Merge branch 'mg/track' into next
commita7c84663381803dae7b981f0190c314aa5c5534f
authorJunio C Hamano <gitster@pobox.com>
Sun, 17 May 2009 07:40:39 +0000 (17 00:40 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 17 May 2009 07:40:39 +0000 (17 00:40 -0700)
tree9cdf165887ad963167f6fb78ebc63098f4a14843
parent3b334f8d2828097d4faa08f807f5141c8dbfbbd4
parent57ffc5f85a17416a718d4e7baf71d8356c9c7808
Merge branch 'mg/track' into next

* mg/track:
  Fix behavior with non-commit upstream references
  Test tracking of non-commit upstreams
remote.c
t/t6040-tracking-info.sh