aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/StashApplyCommandTest.java
Commit message (Expand)AuthorAgeFilesLines
* Implement ours/theirs content conflict resolutionThomas Wolf2021-04-191-1/+132
* Update EDL 1.0 license headers to new short SPDX compliant formatMatthias Sohn2020-01-041-38/+5
* ResolveMerger: don't try needlessly to delete directoriesThomas Wolf2018-07-191-1/+1
* Send a detailed event on working tree modificationsThomas Wolf2017-08-151-0/+87
* Enable and fix 'Should be tagged with @Override' warningDavid Pursehouse2017-02-191-0/+1
* Fix StashApplyCommand for stashes containing untracked changes.Thomas Wolf2017-01-151-0/+17
* Fix integer boxing eclipse warningHugo Arès2015-09-171-1/+1
* Allow to include untracked files in stash operations.Andreas Hermann2014-05-221-1/+89
* Fix applying stash on other commitStefan Lay2013-11-291-0/+87
* document empty blocks in StashApplyCommandTestTomasz Zarna2013-06-131-0/+3
* A deleted work tree file is not a conflict when merge wants to delete itRobin Rosenberg2013-04-081-0/+15
* Move base test classes to the junit bundle for reuse for Java 7 testsRobin Rosenberg2013-02-041-1/+1
* Fix stash apply using merge logicRobin Rosenberg2013-01-301-9/+67
* The Git API's only likes /, not \ in pathsRobin Rosenberg2012-08-211-1/+1
* Ensure a directory exists before trying to create/merge a file into it.Jevgeni Zelenkov2012-08-061-0/+32
* Only unstash files changed when originally stashedKevin Sawicki2012-03-131-0/+110
* Reuse Git object created in setUpKevin Sawicki2012-03-051-9/+9
* Add command support for applying a stashed commitKevin Sawicki2012-02-281-0/+346