summaryrefslogtreecommitdiff
path: root/tests/merge/merge_helpers.c
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | This was not converted when we converted the rest, so do it now.
* refs: remove the _with_log differentiationCarlos Martín Nieto2014-01-151-1/+1
| | | | | | Any well-behaved program should write a descriptive message to the reflog whenever it updates a reference. Let's make this more prominent by removing the version without the reflog parameters.
* 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