summaryrefslogtreecommitdiff
path: root/tests/revert
Commit message (Expand)AuthorAgeFilesLines
* Renamed git_merge_options 'flags' to 'tree_flags'Jacques Germishuys2015-03-161-2/+2
* reset: remove reflog message overrideCarlos Martín Nieto2015-03-031-14/+14
* Remove the signature from ref-modifying functionsCarlos Martín Nieto2015-03-031-14/+14
* revert tests: always use core.autocrlf=false in testsEdward Thomson2014-10-271-8/+6
* Allow to propagate checkout callbacks to git HARD resetSven Strickroth2014-08-031-14/+14
* Capture conflict information in MERGE_MSG for revert and mergeJacques Germishuys2014-04-141-1/+13
* Update git_merge_tree_opts to git_merge_optionsEdward Thomson2014-03-201-4/+4
* git_revert_opts -> git_revert_optionsoptions-namesBen Straub2014-03-061-6/+6
* More merge.conflictstyle fixesBen Straub2014-02-051-0/+7
* Add reflog parameters to git_resetBen Straub2014-02-031-14/+14
* Remove the "merge none" flagEdward Thomson2014-01-201-6/+3
* merge_file should use more aggressive levelsEdward Thomson2014-01-201-1/+198
* Reorder var decls in revert testEdward Thomson2013-12-031-13/+13
* Bare naked merge and rebaseEdward Thomson2013-12-032-13/+120
* Introduce git_revert to revert a single commitEdward Thomson2013-12-021-0/+364