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

1  2 
builtin-grep.c
builtin-update-index.c

diff --cc builtin-grep.c
Simple merge
Simple merge