Edward Thomson 967f5a76b1 git_checkout_index: checkout other indexes ... git_checkout_index can now check out other git_index's (that are not necessarily the repository index). This allows checkout_index to use the repository's index for stat cache information instead of the index data being checked out. git_merge and friends now check out their indexes directly instead of trying to blend it into the running index.		2014-07-01 17:32:15 -04:00
..
trees	Update git_merge_tree_opts to git_merge_options	2014-03-20 09:25:08 -07:00
workdir	git_checkout_index: checkout other indexes	2014-07-01 17:32:15 -04:00
files.c	Introduce git_merge_file for consumers	2014-03-20 09:25:05 -07:00
merge_helpers.c	Remove git_merge_result as it's now unnecessary	2014-03-20 09:25:09 -07:00
merge_helpers.h	Remove git_merge_result as it's now unnecessary	2014-03-20 09:25:09 -07:00