summaryrefslogtreecommitdiff
path: root/tests/cherrypick
Commit message (Expand)AuthorAgeFilesLines
* merge: rename `git_merge_tree_flags_t` -> `git_merge_flags_t`Edward Thomson2015-11-251-2/+2
* Renamed git_merge_options 'flags' to 'tree_flags'Jacques Germishuys2015-03-161-2/+2
* reset: remove reflog message overrideCarlos Martín Nieto2015-03-031-10/+10
* Remove the signature from ref-modifying functionsCarlos Martín Nieto2015-03-031-10/+10
* Fix test buildCarlos Martín Nieto2014-10-101-1/+1
* Merge pull request #2499 from csware/hard-reset-checkout-callbacksCarlos Martín Nieto2014-10-101-9/+9
|\
| * Allow to propagate checkout callbacks to git HARD resetSven Strickroth2014-08-031-9/+9
* | Added test case to illustrate bogus conflicts detected if no files were merge...Jacques Germishuys2014-09-121-0/+41
|/
* git_cherry_pick -> git_cherrypickEdward Thomson2014-07-222-29/+29
* Added cherry pick testsJacques Germishuys2014-04-142-0/+535