summaryrefslogtreecommitdiff
path: root/tests/merge/workdir/submodules.c
Commit message (Expand)AuthorAgeFilesLines
* reset: remove reflog message overrideCarlos Martín Nieto2015-03-031-2/+2
* Remove the signature from ref-modifying functionsCarlos Martín Nieto2015-03-031-2/+2
* s/git_merge_head/git_annotated_commitEdward Thomson2014-10-261-8/+8
* Allow to propagate checkout callbacks to git HARD resetSven Strickroth2014-08-031-2/+2
* Remove `git_merge_result` as it's now unnecessaryEdward Thomson2014-03-201-6/+2
* Change signature of `git_merge` to take merge and checkout optsEdward Thomson2014-03-201-4/+2
* Add reflog parameters to git_resetBen Straub2014-02-031-2/+2
* Merge submodulesEdward Thomson2014-01-201-0/+101