Andrew's git / gitweb.git / diff
?
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 patch | diff1 | diff2 | blob | history
builtin-update-index.c patch | diff1 | diff2 | blob | history
diff --cc builtin-grep.c
Simple merge
diff --cc builtin-update-index.c
Simple merge