aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeConfig.java
Commit message (Expand)AuthorAgeFilesLines
* Update EDL 1.0 license headers to new short SPDX compliant formatMatthias Sohn2020-01-041-38/+5
* Enable and fix "Statement unnecessarily nested within else clause" warningsDavid Pursehouse2019-10-171-6/+6
* Fix javadoc in org.eclipse.jgit merge packageMatthias Sohn2017-12-191-4/+18
* Enable and fix 'Should be tagged with @Override' warningDavid Pursehouse2017-02-191-0/+1
* Organize importsDavid Pursehouse2016-11-141-1/+1
* Use branch.<x>.mergeoptions and merge.ff as defaults for mergingKonrad Kügler2014-02-141-0/+189