From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 28 Dec 2010 21:53:51 +0000 (-0800)
Subject: Merge branch 'master' into next
X-Git-Tag: ko-next~38
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=dee8dc8369a19c1b8b12dd40bf3a563a7524825b;p=git.git

Merge branch 'master' into next

* master:
  Git 1.7.4-rc0
  Prepare for 1.7.3.5
  t9001: use older Getopt::Long boolean prefix '--no' rather than '--no-'
  Fix false positives in t3404 due to SHELL=/bin/false
  setup_work_tree: adjust relative $GIT_WORK_TREE after moving cwd
  close file on error in read_mmfile()
---

dee8dc8369a19c1b8b12dd40bf3a563a7524825b