From: Junio C Hamano <junkio@cox.net>
Date: Thu, 27 Apr 2006 00:08:00 +0000 (-0700)
Subject: Merge branch 'fix'
X-Git-Tag: v1.4.0-rc1~212
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=69bcc43eca0f251617e3b5db5df632b24db94e92;p=git-core%2Fgit.git

Merge branch 'fix'

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

69bcc43eca0f251617e3b5db5df632b24db94e92