git.99rst.org Git - git.git/commit

author	Junio C Hamano <redacted>
	Wed, 3 Sep 2008 22:35:37 +0000 (15:35 -0700)
committer	Junio C Hamano <redacted>
	Wed, 3 Sep 2008 22:35:37 +0000 (15:35 -0700)
commit	6a42cfe86c485675987b64690e75d8821567d328
tree	be6e1a64fa65abe7f0013e0256a9439f6e73e0ac	tree \| snapshot
parent	36f44a06802960abce7febbf9cc40461e5546ee5	commit \| diff
parent	bb528633b34ac9c338a7761f3e1d251e0c560ed6	commit \| 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

RSS Atom

git clone https://git.99rst.org/PROJECT

builtin-grep.c	diff1 \|	diff2 \|	blob \| history
builtin-update-index.c	diff1 \|	diff2 \|	blob \| history