Edward Thomson
094cfc2904
cherrypick, revert: drop unnecessary SAFE_CREATE
2015-02-27 13:47:30 -05:00
Edward Thomson
41fae48df2
indexwriter: an indexwriter for repo operations
...
Provide git_indexwriter_init_for_operation for the common locking
pattern in merge, rebase, revert and cherry-pick.
2015-02-14 09:25:36 -05:00
Edward Thomson
be8404a768
merge-like operations: lock index while working
2015-02-14 09:25:35 -05: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
Russell Belfer
bc91347b58
Fix remaining init_options inconsistencies
...
There were a couple of "init_opts()" functions a few more cases
of structure initialization that I somehow missed.
2014-05-02 09:21:33 -07:00
Jacques Germishuys
6fefb7af84
Capture conflict information in MERGE_MSG for revert and merge
2014-04-14 16:16:22 +02:00
Edward Thomson
5aa2ac6de1
Update git_merge_tree_opts to git_merge_options
2014-03-20 09:25:08 -07:00
Ben Straub
aa17c3c63c
git_revert_opts -> git_revert_options
2014-03-06 09:44:52 -08:00
Matthew Bowen
b9f819978c
Added function-based initializers for every options struct.
...
The basic structure of each function is courtesy of arrbee.
2014-03-05 21:49:23 -05:00
Edward Thomson
86a05ef382
Validate struct versions in merge, revert
2013-12-12 17:40:40 -05:00
Edward Thomson
5588f07360
Clean up warnings
2013-12-09 11:40:44 -05:00
Edward Thomson
eac938d96e
Bare naked merge and rebase
2013-12-03 10:18:53 -05:00
Edward Thomson
bab0b9f2d2
clean up state metadata more consistently
2013-12-02 16:57:41 -06:00
Edward Thomson
300d192f7e
Introduce git_revert to revert a single commit
2013-12-02 16:57:41 -06:00
