Merge branch 'jc/maint-fetch-regression-1.5.4'
commit660b9c3a4e24ce9a2628f2ec88902e2384d1aade
authorJunio C Hamano <gitster@pobox.com>
Wed, 26 Mar 2008 08:49:41 +0000 (26 01:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 26 Mar 2008 08:49:41 +0000 (26 01:49 -0700)
tree5fd25724e2838ff6466932702876bcdbfb10204d
parent7d19da46fd108ec463e555cb9fd9efd13b582d4a
parenta466637c57b969626344e5998b29fb123569fdc2
Merge branch 'jc/maint-fetch-regression-1.5.4'

* jc/maint-fetch-regression-1.5.4:
  git-fetch test: test tracking fetch results, not just FETCH_HEAD
  Fix branches file configuration
  Tighten refspec processing
  Fix the wrong output of `git-show v1.3.0~155^2~4` in documentation.
remote.c