Merge branch 'mg/track'
commitc9a88deede2e3438a70be7df233678d6a0fece74
authorJunio C Hamano <gitster@pobox.com>
Sat, 23 May 2009 08:44:00 +0000 (23 01:44 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 23 May 2009 08:44:00 +0000 (23 01:44 -0700)
tree2abe2481fb9d9e84cda22452d779b3dd7f8c4593
parent44ee247f8db243fbd3c50fee0fe35696ed7da8d3
parent57ffc5f85a17416a718d4e7baf71d8356c9c7808
Merge branch 'mg/track'

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