tests/cherrypick


Log

Author Commit Date CI Message
Carlos Martín Nieto 942a7b39 2014-10-10T18:03:09 Fix test build Some PRs have fallen out of sync with the changes in signatures, so we need to take a few extra parameters into account.
Carlos Martín Nieto 0625638f 2014-10-10T17:40:53 Merge pull request #2499 from csware/hard-reset-checkout-callbacks Allow to propagate checkout callbacks to git HARD reset
Jacques Germishuys 493c340c 2014-09-12T21:59:09 Added test case to illustrate bogus conflicts detected if no files were merged, and untracked files exist in the workdir.
Sven Strickroth b8add6c4 2014-08-03T15:44:13 Allow to propagate checkout callbacks to git HARD reset Signed-off-by: Sven Strickroth <email@cs-ware.de>
Edward Thomson 0ba4dca5 2014-07-22T10:40:23 git_cherry_pick -> git_cherrypick
Jacques Germishuys 103b7d21 2014-04-02T13:57:11 Added cherry pick tests