Merge branch 'nd/worktree' into maint
commit6a42cfe86c485675987b64690e75d8821567d328
authorJunio C Hamano <gitster@pobox.com>
Wed, 3 Sep 2008 22:35:37 +0000 (3 15:35 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 3 Sep 2008 22:35:37 +0000 (3 15:35 -0700)
treebe6e1a64fa65abe7f0013e0256a9439f6e73e0ac
parent36f44a06802960abce7febbf9cc40461e5546ee5
parentbb528633b34ac9c338a7761f3e1d251e0c560ed6
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
builtin-grep.c
builtin-update-index.c