aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit/src/org/eclipse/jgit/api/StashApplyCommand.java
Commit message (Expand)AuthorAgeFilesLines
* Remove deprecated StashApplyCommand#setApplyUntracked methodMatthias Sohn2024-09-031-13/+0
* Remove deprecated StashApplyCommand#setApplyIndex methodMatthias Sohn2024-09-031-12/+0
* Checkout: better directory handlingThomas Wolf2023-09-031-12/+11
* DirCacheCheckout: load WorkingTreeOptions only onceThomas Wolf2022-08-141-3/+6
* Implement ours/theirs content conflict resolutionThomas Wolf2021-04-191-26/+63
* Update EDL 1.0 license headers to new short SPDX compliant formatMatthias Sohn2020-01-041-38/+5
* Merge branch 'stable-5.2' into stable-5.3Matthias Sohn2019-08-081-1/+1
|\
| * Use Instant instead of milliseconds for filesystem timestamp handlingMatthias Sohn2019-07-181-1/+1
* | Return 'this' from setters in commandsMario Molina2019-01-071-6/+36
|/
* Remove 'final' in parameter listsHan-Wen Nienhuys2018-05-151-2/+2
* Fix javadoc in org.eclipse.jgit annotations and api packagesMatthias Sohn2017-12-181-8/+14
* TreeWalk: Make getEolStreamType(OperationType) publicDavid Pursehouse2017-11-151-1/+4
* Send a detailed event on working tree modificationsThomas Wolf2017-08-151-2/+19
* 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-5/+5
* Fix StashApply regarding handling of untracked filesChristian Halstrick2016-05-191-2/+7
* Add EOL stream type detection to TreeWalkIvan Motsch2016-03-071-3/+9
* Delete non empty directories before checkout a pathAndrey Loskutov2015-10-091-1/+1
* Silence non-externalized string warnings in org.eclipse.jgitMatthias Sohn2015-05-261-4/+4
* Use AutoClosable to close resources in bundle org.eclipse.jgitMatthias Sohn2015-05-211-14/+5
* Deprecate checkoutEntry variant that accepts FileShawn Pearce2014-11-271-3/+1
* Cleanup TreeWalk creation/release inside StashApplyCommandShawn Pearce2014-11-241-4/+2
* Rename local variables/parameters to remove warnings about hidingRobin Rosenberg2014-09-041-3/+3
* Allow to include untracked files in stash operations.Andreas Hermann2014-05-221-3/+95
* Allow callers to use different merging strategiesLaurent Goubet2014-05-061-3/+16
* Implement rebase.autostashStefan Lay2013-12-041-1/+14
* Fix applying stash on other commitStefan Lay2013-11-291-0/+1
* Add NON-NLS comments for some obviously untranslatable stringsRobin Rosenberg2013-07-211-1/+1
* Make recursive merge strategy the default merge strategyMatthias Sohn2013-04-151-2/+2
* Fix stash apply using merge logicRobin Rosenberg2013-01-301-226/+107
* Mark non-externalizable strings as suchRobin Rosenberg2012-12-271-3/+3
* Further cleanup of exceptions in Git APIRobin Rosenberg2012-06-051-1/+4
* Git API does not declare GitAPIException call() and related cleanupsRobin Rosenberg2012-05-301-4/+3
* Only unstash files changed when originally stashedKevin Sawicki2012-03-131-49/+232
* Move JGitText to an internal packageRobin Rosenberg2012-03-121-1/+1
* Add command support for applying a stashed commitKevin Sawicki2012-02-281-0/+195