From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 3 Sep 2008 22:35:37 +0000 (-0700)
Subject: Merge branch 'nd/worktree' into maint
X-Git-Tag: v1.6.0.2~22
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6a42cfe86c485675987b64690e75d8821567d328;p=git.git

Merge branch 'nd/worktree' into maint

* nd/worktree:
  setup_git_directory(): fix move to worktree toplevel directory
  update-index: fix worktree setup
  read-tree: setup worktree if merge is required
  grep: fix worktree setup
  diff*: fix worktree setup
---

6a42cfe86c485675987b64690e75d8821567d328