Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Added CLIText.fatalError(String) API for tests | Andrey Loskutov | 2016-01-06 | 1 | -2/+4 |
* | Make sure tests don't blindly continue if a command is "silently" failed | Andrey Loskutov | 2015-12-31 | 1 | -2/+2 |
* | Handle -m option for Merge command | Axel Richard | 2014-08-30 | 1 | -1/+24 |
* | Make recursive merge strategy the default merge strategy | Matthias Sohn | 2013-04-15 | 1 | -1/+1 |
* | Add the no-commit option to MergeCommand | Tomasz Zarna | 2013-04-04 | 1 | -0/+34 |
* | Add support for --no-ff while merging | Tomasz Zarna | 2012-11-16 | 1 | -2/+57 |
* | Add --squash option to org.eclipse.jgit.pgm.Merge | Tomasz Zarna | 2012-10-07 | 1 | -13/+43 |
* | Add tests for output result of merging -- org.eclipse.jgit.pgm.Merge | Tomasz Zarna | 2012-09-17 | 1 | -0/+93 |