summaryrefslogtreecommitdiff
path: root/src/revert.c
Commit message (Collapse)AuthorAgeFilesLines
* cherrypick, revert: drop unnecessary SAFE_CREATEEdward Thomson2015-02-271-1/+1
|
* indexwriter: an indexwriter for repo operationsEdward Thomson2015-02-141-23/+9
| | | | | Provide git_indexwriter_init_for_operation for the common locking pattern in merge, rebase, revert and cherry-pick.
* merge-like operations: lock index while workingEdward Thomson2015-02-141-4/+23
|
* git_checkout_index: checkout other indexesEdward Thomson2014-07-011-6/+4
| | | | | | | | 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.
* Fix remaining init_options inconsistenciesRussell Belfer2014-05-021-9/+4
| | | | | There were a couple of "init_opts()" functions a few more cases of structure initialization that I somehow missed.
* Capture conflict information in MERGE_MSG for revert and mergeJacques Germishuys2014-04-141-0/+1
|
* Update git_merge_tree_opts to git_merge_optionsEdward Thomson2014-03-201-3/+3
|
* git_revert_opts -> git_revert_optionsoptions-namesBen Straub2014-03-061-12/+12
|
* Added function-based initializers for every options struct.Matthew Bowen2014-03-051-0/+12
| | | | The basic structure of each function is courtesy of arrbee.
* Validate struct versions in merge, revertEdward Thomson2013-12-121-0/+2
|
* Clean up warningsEdward Thomson2013-12-091-8/+2
|
* Bare naked merge and rebaseEdward Thomson2013-12-031-41/+69
|
* clean up state metadata more consistentlyEdward Thomson2013-12-021-29/+8
|
* Introduce git_revert to revert a single commitEdward Thomson2013-12-021-0/+217