aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit/src/org/eclipse/jgit/merge/Merger.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-4/+4
* Fix javadoc in org.eclipse.jgit merge packageMatthias Sohn2017-12-191-11/+23
* Support creating Mergers without a RepositoryDave Borowitz2017-04-051-7/+53
* Add progress monitor to MergerLaurent Delaigue2016-01-211-0/+26
* Delete deprecated Merger.getBaseCommit()Matthias Sohn2015-06-031-33/+0
* Replace deprecated release() methods by close() in MergerMatthias Sohn2015-04-041-5/+5
* Add a Merger.merge method that makes flushing optionalDave Borowitz2014-08-131-2/+32
* Teach mergers to use ObjectInserter.newReader()Dave Borowitz2014-08-131-17/+14
* Merger: clarify getBaseCommit javadocDave Borowitz2014-08-111-2/+6
* Fix exception on conflicts with recursive mergeRobin Stocker2013-12-031-20/+9
* Add missing @since tagsMatthias Sohn2013-03-221-0/+2
* Implement recursive merge strategyGeorge C. Young2013-02-221-11/+33
* Allow applications to pass ObjectInserter to MergerShawn O. Pearce2012-06-141-0/+19
* Move JGitText to an internal packageRobin Rosenberg2012-03-121-1/+1
* Ensure the ObjectInserter flushes after a mergeShawn O. Pearce2011-10-261-1/+4
* Fix ClassCastException in MergeCommandDenys Digtiar2011-08-211-1/+1
* Add getBaseCommit() to MergerChristian Halstrick2010-08-261-3/+22
* Use ObjectReader in RevWalk, TreeWalkShawn O. Pearce2010-06-281-7/+7
* Release ObjectInserter in merge() not mergeImpl()Shawn O. Pearce2010-06-281-1/+6
* Replace WindowCache with ObjectReaderShawn O. Pearce2010-06-251-2/+2
* Start using ObjectInserter instead of ObjectWriterShawn O. Pearce2010-06-251-6/+6
* Externalize strings from JGitSasa Zivkov2010-05-191-4/+5
* Initial JGit contribution to eclipse.orgGit Development Community2009-09-291-0/+235
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-01 01:06:43 +0000