6 Commits

Author	SHA1	Message	Date
Carlos Martín Nieto	942a7b39ed	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.	2014-10-10 18:03:09 +02:00
Carlos Martín Nieto	0625638f06	Merge pull request #2499 from csware/hard-reset-checkout-callbacks ... Allow to propagate checkout callbacks to git HARD reset	2014-10-10 17:40:53 +02:00
Jacques Germishuys	493c340cef	Added test case to illustrate bogus conflicts detected if no files were merged, and untracked files exist in the workdir.	2014-09-12 22:01:22 +02:00
Sven Strickroth	b8add6c42e	Allow to propagate checkout callbacks to git HARD reset ... Signed-off-by: Sven Strickroth <email@cs-ware.de>	2014-08-03 16:29:51 +02:00
Edward Thomson	0ba4dca526	git_cherry_pick -> git_cherrypick	2014-07-22 10:40:23 -04:00
Jacques Germishuys	103b7d2122	Added cherry pick tests	2014-04-14 16:16:22 +02:00