summaryrefslogtreecommitdiff
path: root/diffcore.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-03-18 14:03:24 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-03-18 14:03:24 -0700
commit1f569775810be1655c284076082015168865d005 (patch)
treec773162fe6f354f2db976193410d107bff8acf45 /diffcore.h
parentMerge branch 'jc/check-attr-honor-working-tree' into maint (diff)
parentreset: optionally setup worktree and refresh index on --mixed (diff)
downloadtgif-1f569775810be1655c284076082015168865d005.tar.xz
Merge branch 'nd/reset-setup-worktree' into maint
"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
Diffstat (limited to 'diffcore.h')
0 files changed, 0 insertions, 0 deletions