Sven Strickroth
b8add6c42e
Allow to propagate checkout callbacks to git HARD reset
...
Signed-off-by: Sven Strickroth <email@cs-ware.de>
2014-08-03 16:29:51 +02:00
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
Edward Thomson
a4e2c36a66
merge: checkout default shouldn't clobber given
2014-04-23 19:43:35 -04:00
Edward Thomson
26564d80aa
merge: default checkout strategy for should be SAFE
2014-04-23 19:42:50 -04:00
Edward Thomson
d9fdee6e4c
Remove git_merge_result as it's now unnecessary
2014-03-20 09:25:09 -07:00
Edward Thomson
5aa2ac6de1
Update git_merge_tree_opts to git_merge_options
2014-03-20 09:25:08 -07:00
Edward Thomson
02105a27f0
Change signature of git_merge to take merge and checkout opts
2014-03-20 09:25:07 -07:00
Ben Straub
5c8be32559
Fix a few references to changed function signatures
2014-02-05 13:32:45 -08:00
Edward Thomson
bb13d39162
Test that emulates a strange filter implementation
2014-02-03 19:56:34 -08:00
Edward Thomson
16eb8b7c06
Tests merging staged files identical to result
2014-02-03 19:56:34 -08:00
Edward Thomson
b60149eced
Tests merge when changes exist in workdir/index
2014-02-03 19:56:33 -08:00
