]> rtime.felk.cvut.cz Git - git.git/commit
projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 36f44a0 bb52863)
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)
commit6a42cfe86c485675987b64690e75d8821567d328
treebe6e1a64fa65abe7f0013e0256a9439f6e73e0actree | snapshot
parent36f44a06802960abce7febbf9cc40461e5546ee5commit | diff
parentbb528633b34ac9c338a7761f3e1d251e0c560ed6commit | diff
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 diff1 | diff2 | blob | history
builtin-update-index.c diff1 | diff2 | blob | history
Git mirror and local development