Merge branch 'nh/fetch-http' into next
authorJunio C Hamano <junkio@cox.net>
Thu, 27 Apr 2006 00:23:51 +0000 (17:23 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 27 Apr 2006 00:23:51 +0000 (17:23 -0700)
* nh/fetch-http:
  git-fetch: resolve remote symrefs for HTTP transport
  commit-tree.c: check_valid() microoptimization.
  Fix filename verification when in a subdirectory
  rebase: typofix.
  socksetup: don't return on set_reuse_addr() error

1  2 
cache.h

diff --cc cache.h
Simple merge