| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Fix test build | Carlos Martín Nieto | 2014-10-10 | 1 | -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-callbacks | Carlos Martín Nieto | 2014-10-10 | 1 | -9/+9 |
| |\ | | | | | Allow to propagate checkout callbacks to git HARD reset | ||||
| | * | Allow to propagate checkout callbacks to git HARD reset | Sven Strickroth | 2014-08-03 | 1 | -9/+9 |
| | | | | | | | | | Signed-off-by: Sven Strickroth <email@cs-ware.de> | ||||
| * | | Added test case to illustrate bogus conflicts detected if no files were ↵ | Jacques Germishuys | 2014-09-12 | 1 | -0/+41 |
| |/ | | | | merged, and untracked files exist in the workdir. | ||||
| * | git_cherry_pick -> git_cherrypick | Edward Thomson | 2014-07-22 | 2 | -29/+29 |
| | | |||||
| * | Added cherry pick tests | Jacques Germishuys | 2014-04-14 | 2 | -0/+535 |
