Merge branch 'fix'
authorJunio C Hamano <junkio@cox.net>
Thu, 27 Apr 2006 00:08:00 +0000 (17:08 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 27 Apr 2006 00:08:00 +0000 (17:08 -0700)
* 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

1  2 
commit-tree.c
revision.c

diff --cc commit-tree.c
Simple merge
diff --cc revision.c
Simple merge