summaryrefslogtreecommitdiff
path: root/tests/merge/merge_helpers.c
Commit message (Collapse)AuthorAgeFilesLines
* Remove the signature from ref-modifying functionsCarlos Martín Nieto2015-03-031-1/+1
| | | | | | | | | | The signature for the reflog is not something which changes dynamically. Almost all uses will be NULL, since we want for the repository's default identity to be used, making it noise. In order to allow for changing the identity, we instead provide git_repository_set_ident() and git_repository_ident() which allow a user to override the choice of signature.
* s/git_merge_head/git_annotated_commitEdward Thomson2014-10-261-4/+5
| | | | | Rename git_merge_head to git_annotated_commit, as it becomes used in more operations than just merge.
* 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
| | | | 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