From: Junio C Hamano <junkio@cox.net>
Date: Thu, 27 Apr 2006 01:32:45 +0000 (-0700)
Subject: Merge branch 'master' into jc/cache-tree
X-Git-Tag: v1.4.0-rc1~45^2~15
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e7afa1115beb071512ac2b8d6b7487eadbfccc74;p=git.git

Merge branch 'master' into jc/cache-tree

* master:
  t0000-basic: more commit-tree tests.
  commit-tree.c: check_valid() microoptimization.
  Fix filename verification when in a subdirectory
  rebase: typofix.
  socksetup: don't return on set_reuse_addr() error
---

e7afa1115beb071512ac2b8d6b7487eadbfccc74