summaryrefslogtreecommitdiff
path: root/tests/cherrypick
Commit message (Collapse)AuthorAgeFilesLines
* Fix test buildCarlos Martín Nieto2014-10-101-1/+1
| | | | | Some PRs have fallen out of sync with the changes in signatures, so we need to take a few extra parameters into account.
* 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 reset
| * Allow to propagate checkout callbacks to git HARD resetSven Strickroth2014-08-031-9/+9
| | | | | | | | Signed-off-by: Sven Strickroth <email@cs-ware.de>
* | Added test case to illustrate bogus conflicts detected if no files were ↵Jacques Germishuys2014-09-121-0/+41
|/ | | | merged, and untracked files exist in the workdir.
* git_cherry_pick -> git_cherrypickEdward Thomson2014-07-222-29/+29
|
* Added cherry pick testsJacques Germishuys2014-04-142-0/+535