aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeResult.java
Commit message (Expand)AuthorAgeFilesLines
* Fix javadoc in org.eclipse.jgit annotations and api packagesMatthias Sohn2017-12-181-13/+38
* Enable and fix warnings about redundant specification of type argumentsDavid Pursehouse2017-02-201-2/+2
* Enable and fix 'Should be tagged with @Override' warningDavid Pursehouse2017-02-191-0/+2
* Silence non-externalized string warnings in org.eclipse.jgitMatthias Sohn2015-05-261-12/+12
* Fix Javadoc errors with Java 8Robin Stocker2014-08-021-3/+3
* Cleanup javadocs so they pass the java8 doclint checksRobin Rosenberg2014-03-291-8/+12
* Fix MERGED_NOT_COMMITTED toStringRobin Stocker2013-07-181-1/+1
* Add the no-commit option to MergeCommandTomasz Zarna2013-04-041-0/+27
* Improve handling of checkout conflictsMarkus Duft2013-01-111-0/+40
* Mark non-externalizable strings as suchRobin Rosenberg2012-12-271-0/+1
* Add support for --no-ff while mergingTomasz Zarna2012-11-161-0/+14
* Add "--squash" option to MergeCommandTomasz Zarna2012-06-151-1/+29
* Cleanup MergeResult constructorsTomasz Zarna2012-05-101-6/+8
* Add @Override annotations to enumsTomasz Zarna2012-04-021-0/+5
* Move JGitText to an internal packageRobin Rosenberg2012-03-121-1/+1
* Add isSuccessful to MergeStatus, RebaseResult.Status and PullResultRobin Stocker2011-08-091-1/+36
* Do not categorize merge failures as 'abnormal'Philipp Thun2011-03-281-6/+6
* Improve MergeResultPhilipp Thun2011-03-211-2/+51
* Replace 'occured' by 'occurred'Philipp Thun2011-03-151-1/+1
* Use entrySet() instead of keySet()Robin Stocker2010-10-291-2/+3
* Refactor diff sequence APIShawn O. Pearce2010-09-061-3/+3
* Added merge strategy RESOLVEChristian Halstrick2010-08-311-2/+65
* Enhance MergeResult to report conflicts, etcChristian Halstrick2010-08-191-14/+119
* Add a merge command to the jgit APIStefan Lay2010-05-241-0/+150