summaryrefslogtreecommitdiff
path: root/merge-file.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2007-07-27 23:51:45 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2007-07-28 00:06:00 -0700
commit83b3df7d582429d9036f34d2c95abfff7bf0ab24 (patch)
tree6d347b14edee2df30ca7b9620d93789861f4bc72 /merge-file.c
parentFix git-stash apply --index (diff)
downloadtgif-83b3df7d582429d9036f34d2c95abfff7bf0ab24.tar.xz
git-stash apply --index: optimize postprocessing
Originally, "apply --index" codepath was bolted on to the "update working tree files and index, but then revert the changes we make to the index except for added files so that we do not forget about them" codepath, almost as an afterthought. Because "apply --index" first prepares the final index state upfront, "revert except the added paths" postprocessing does not have to be done. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-file.c')
0 files changed, 0 insertions, 0 deletions