aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit/src/org/eclipse/jgit/merge
Commit message (Expand)AuthorAgeFilesLines
* Fix jgit build broken by deabacc4Matthias Sohn2010-12-031-1/+1
* Fixed Merge Algorithm regarding concurrent file creationsChristian Halstrick2010-12-021-3/+5
* Change default diff algorithm to histogram and add testsChristian Halstrick2010-11-261-4/+4
* Make diff algorithm configurableChristian Halstrick2010-11-262-9/+31
* Fix bug regarding handling of non-versioned files during mergeChristian Halstrick2010-11-221-1/+1
* Merge "Format merge commit messages like C Git"Shawn Pearce2010-11-091-0/+132
|\
| * Format merge commit messages like C GitRobin Stocker2010-11-061-0/+132
* | Fixed ResolveMerger regarding handling of deletionsChristian Halstrick2010-11-071-10/+26
|/
* Fixed merge algorithm regarding adjacent modificationsChristian Halstrick2010-11-021-4/+4
* Fix Severe Bug in Merge AlgorithmChristian Halstrick2010-10-281-8/+19
* Rename method to ResolveMerger.setWorkingTreeIterator()Christian Halstrick2010-10-131-7/+7
* Extend merge support for bare repositoriesDmitry Fink2010-09-247-39/+133
* Define DiffAlgorithm as an abstract functionShawn O. Pearce2010-09-101-2/+2
* Refactor diff sequence APIShawn O. Pearce2010-09-064-18/+27
* Improve MergeAlgorithm to produce smaller conflictsChristian Halstrick2010-08-311-4/+35
* Added merge strategy RESOLVEChristian Halstrick2010-08-313-0/+636
* Add getBaseCommit() to MergerChristian Halstrick2010-08-261-3/+22
* Fix Javadoc warningsRobin Stocker2010-07-271-3/+2
* Use ObjectReader in DirCacheBuilder.addTreeShawn O. Pearce2010-06-291-1/+1
* Use ObjectReader in RevWalk, TreeWalkShawn O. Pearce2010-06-282-8/+8
* Release ObjectInserter in merge() not mergeImpl()Shawn O. Pearce2010-06-282-10/+8
* Replace WindowCache with ObjectReaderShawn O. Pearce2010-06-251-2/+2
* Start using ObjectInserter instead of ObjectWriterShawn O. Pearce2010-06-252-7/+17
* Externalize strings from JGitSasa Zivkov2010-05-192-6/+8
* Remove unnecessary semicolon in MergeChunkShawn O. Pearce2010-01-061-1/+2
* Add file content merge algorithmChristian Halstrick2010-01-064-0/+688
* Initial JGit contribution to eclipse.orgGit Development Community2009-09-296-0/+862
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-23 23:08:19 +0000