| commit | 6eb593a764303c05c7ca4f0fd107c5118b9cf7fb | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 14 Mar 2014 21:25:02 +0000 (14 14:25 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 14 Mar 2014 21:25:03 +0000 (14 14:25 -0700) | ||
| tree | 8264b088a2d90ebb77adaf6afce0f99fed8f7845 | treesnapshot (tar.gz zip) |
| parent | ed277519613d6f6bb422c4e4b7523ef8981a1c25 | commitdiff |
| parent | b7756d41dcc6720e6005b663bcb6f8b2f2a66763 | commitdiff |
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
"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 | blobhistory |
| t/t7102-reset.sh | diff1 | diff2 | blobhistory |