git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ed27751 b7756d4)
Merge branch 'nd/reset-setup-worktree'
authorJunio C Hamano <redacted>
Fri, 14 Mar 2014 21:25:02 +0000 (14:25 -0700)
committerJunio C Hamano <redacted>
Fri, 14 Mar 2014 21:25:03 +0000 (14:25 -0700)
commit6eb593a764303c05c7ca4f0fd107c5118b9cf7fb
tree8264b088a2d90ebb77adaf6afce0f99fed8f7845tree | snapshot
parented277519613d6f6bb422c4e4b7523ef8981a1c25commit | diff
parentb7756d41dcc6720e6005b663bcb6f8b2f2a66763commit | diff
Merge branch 'nd/reset-setup-worktree'

"git reset" needs to refresh the index when working in a working
tree (it can also be used to match the index to the HEAD in an
otherwise bare repository), but it failed to set up the working
tree properly, causing GIT_WORK_TREE to be ignored.

* nd/reset-setup-worktree:
  reset: optionally setup worktree and refresh index on --mixed
builtin/reset.c diff1 | diff2 | blob | history
t/t7102-reset.sh diff1 | diff2 | blob | history
git clone https://git.99rst.org/PROJECT