aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RebaseCommandTest.java
Commit message (Expand)AuthorAgeFilesLines
* Revert "RevWalk: stop mixing lines of history in topo sort"Alex Spradlin2020-02-261-2/+2
* RevWalk: stop mixing lines of history in topo sortAlex Spradlin2020-02-181-2/+2
* Update EDL 1.0 license headers to new short SPDX compliant formatMatthias Sohn2020-01-041-38/+5
* WorkingTreeModifiedEvent: must be fired explicitly after mergeThomas Wolf2019-11-031-9/+5
* Close RevWalks in testsThomas Wolf2019-10-161-4/+6
* Deprecate Constants.CHARSET in favor of StandardCharsets.UTF_8David Pursehouse2018-09-041-4/+4
* ResolveMerger: don't try needlessly to delete directoriesThomas Wolf2018-07-191-0/+60
* Consistently use Constants.CHARSET rather than StandardCharsets.UTF_8David Pursehouse2018-03-111-4/+4
* Use StandardCharsets.UTF_8 in testsDavid Pursehouse2018-03-071-1/+1
* RebaseCommandTest: Open BufferedReader in try-with-resourceDavid Pursehouse2018-03-051-5/+2
* Use constants from StandardCharsets instead of hard-coded stringsDavid Pursehouse2017-12-071-2/+3
* Enable and fix 'Should be tagged with @Override' warningDavid Pursehouse2017-02-191-0/+40
* RebaseCommandTest: Open RevWalk in try-with-resourceDavid Pursehouse2016-01-251-178/+200
* Replace deprecated release() methods by close()Matthias Sohn2015-05-211-16/+15
* Make RepositoryState.REBASING_MERGE reachable again.Laurent Delaigue2015-03-271-5/+5
* Rebase: Add --preserve-merges supportKonrad Kügler2014-07-151-0/+278
* Interactive rebase: Fix order of commit messages on squashStefan Lay2014-03-271-5/+5
* Fix fast forward rebase with rebase.autostash=trueStefan Lay2014-01-151-0/+39
* Don't use API exception in RebaseTodoLineChristian Halstrick2013-12-111-36/+114
* Fix aborting rebase with detached headStefan Lay2013-12-101-0/+63
* Implement rebase.autostashStefan Lay2013-12-041-0/+137
* Do not allow non-ff-rebase if there are uncommitted changesStefan Lay2013-12-021-28/+152
* Fix FIXUP error for blank lines in interactive rebaseStefan Lay2013-11-221-0/+38
* Fix parsing Rebase todo lines when commit message is missingStefan Lay2013-11-211-0/+13
* Interactive Rebase: Do actions if there were conflictsStefan Lay2013-11-081-0/+207
* Rebase interactive should finish if last step is editStefan Lay2013-11-061-0/+33
* Add additional RebaseResult for editing commitsStefan Lay2013-11-051-1/+1
* Add Squash/Fixup support for rebase interactive in RebaseCommandTobias Pfeifer2013-11-051-1/+338
* Parse commitId and shortMessage of a commented out line in rebase todoTobias Pfeifer2013-10-311-0/+119
* Enhance reading of git-rebase-todo formatted filesChristian Halstrick2013-10-311-25/+122
* Update reflog like C Git during rebase (non-interactive)Robin Rosenberg2013-07-211-2/+90
* Make JGit test work with both hamcrest 1.1 (juno) and 1.3 (kepler)Robin Rosenberg2013-06-091-2/+2
* Support aborting non-interactive rebase started from C GitRobin Stocker2013-03-161-1/+23
* Do not cherry-pick merge commits during rebaseRobin Rosenberg2013-03-081-32/+51
* Move base test classes to the junit bundle for reuse for Java 7 testsRobin Rosenberg2013-02-041-1/+1
* Improve handling of checkout conflictsMarkus Duft2013-01-111-48/+26
* Add support for rebase interactive 'edit' commandDariusz Luksza2012-11-191-0/+52
* Add support for rebase interactive 'reword' commandDariusz Luksza2012-11-191-0/+58
* DirCacheCheckout: Fix handling of files not in indexRobin Stocker2012-09-011-0/+32
* Improve ours/theirs conflict markers for rebase, cherry-pickRobin Stocker2012-08-181-3/+6
* Allow JGit to read C Git rebase stateRobin Rosenberg2012-08-071-2/+2
* Ignore empty lines when parsing git-rebase-todoRobin Stocker2012-06-231-2/+25
* Update ORIG_HEAD when resettingKevin Sawicki2012-05-311-1/+3
* Fix rebase > continue when nothing left to commit.Markus Duft2012-03-091-2/+58
* Remove rebase temporary files on checkout failureBernard Leach2011-05-231-2/+39
* Add tests for change If203ce5Bernard Leach2011-05-181-0/+132
* Introduce FAILED result for RebaseCommandPhilipp Thun2011-03-241-0/+340
* Refactor test casesPhilipp Thun2011-03-211-22/+0
* RebaseCommand: detect and handle fast-forward properlyMathias Kinzler2011-01-281-2/+33
* Convert all JGit unit tests to JUnit 4Robin Rosenberg2010-12-311-1/+28