aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/PullCommandWithRebaseTest.java
Commit message (Expand)AuthorAgeFilesLines
* Use constants from StandardCharsets instead of hard-coded stringsDavid Pursehouse2017-12-071-1/+2
* Support pull on detached HEADMickael Istria2017-05-081-0/+52
* PullCommandWithRebaseTest: Open RevWalk in try-with-resourceDavid Pursehouse2016-02-121-20/+21
* Make RepositoryState.REBASING_MERGE reachable again.Laurent Delaigue2015-03-271-2/+2
* Use absolute paths for file:// URIs in testsShawn Pearce2013-11-011-1/+1
* Remove some unnecessary dependencies on FileRepostoryRobin Rosenberg2013-04-181-2/+1
* JGit 3.0: move internal classes into an internal subpackageShawn Pearce2013-03-181-1/+1
* Move base test classes to the junit bundle for reuse for Java 7 testsRobin Rosenberg2013-02-041-1/+1
* Declare essentially static methods as staticRobin Rosenberg2012-12-271-2/+3
* Add support for pull with --rebase and --no-rebaseMikael Karlsson2012-11-161-0/+70
* cleanup: Prefer assertEquals over assertTrue(....equals(...))Robin Rosenberg2012-09-031-2/+2
* Improve ours/theirs conflict markers for rebase, cherry-pickRobin Stocker2012-08-181-2/+12
* Add tests for change If203ce5Bernard Leach2011-05-181-0/+39
* Proper handling of rebase during pullMathias Kinzler2011-01-311-4/+5
* Make PullCommand work with RebaseMathias Kinzler2011-01-281-0/+254