summaryrefslogtreecommitdiff
path: root/tests/merge/merge_helpers.c
Commit message (Expand)AuthorAgeFilesLines
* Remove the signature from ref-modifying functionsCarlos Martín Nieto2015-03-031-1/+1
* s/git_merge_head/git_annotated_commitEdward Thomson2014-10-261-4/+5
* Fixed merge REUC test for big-endian 64-bitJakub Čajka2014-09-261-1/+1
* Remove `git_merge_result` as it's now unnecessaryEdward Thomson2014-03-201-2/+2
* Update git_merge_tree_opts to git_merge_optionsEdward Thomson2014-03-201-3/+3
* Change signature of `git_merge` to take merge and checkout optsEdward Thomson2014-03-201-2/+4
* git_checkout_opts -> git_checkout_optionsBen Straub2014-03-061-1/+1
* index: rename an entry's id to 'id'Carlos Martín Nieto2014-01-251-2/+2
* refs: remove the _with_log differentiationCarlos Martín Nieto2014-01-151-1/+1
* Clean up warningsEdward Thomson2013-12-091-1/+0
* Bare naked merge and rebaseEdward Thomson2013-12-031-0/+28
* Rename tests-clar to testsBen Straub2013-11-141-0/+333