aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeStrategy.java
Commit message (Expand)AuthorAgeFilesLines
* Update EDL 1.0 license headers to new short SPDX compliant formatMatthias Sohn2020-01-041-38/+5
* Remove 'final' in parameter listsHan-Wen Nienhuys2018-05-151-2/+2
* Fix javadoc in org.eclipse.jgit merge packageMatthias Sohn2017-12-191-3/+7
* Support creating Mergers without a RepositoryDave Borowitz2017-04-051-0/+18
* Enable and fix warnings about redundant specification of type argumentsDavid Pursehouse2017-02-201-1/+1
* Add missing @since tagsMatthias Sohn2013-03-221-0/+1
* Implement recursive merge strategyGeorge C. Young2013-02-221-3/+15
* Mark non-externalizable strings as suchRobin Rosenberg2012-12-271-2/+2
* Move JGitText to an internal packageRobin Rosenberg2012-03-121-1/+1
* Extend merge support for bare repositoriesDmitry Fink2010-09-241-0/+14
* Added merge strategy RESOLVEChristian Halstrick2010-08-311-0/+4
* Externalize strings from JGitSasa Zivkov2010-05-191-2/+3
* Initial JGit contribution to eclipse.orgGit Development Community2009-09-291-0/+141