aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit/src/org/eclipse/jgit/merge
Commit message (Expand)AuthorAgeFilesLines
* Add "--squash" option to MergeCommandTomasz Zarna2012-06-152-2/+108
* Remove unused import of ObjectInserter in ResolveMergerTomasz Zarna2012-06-151-2/+1
* Use only a single ObjectInserter in ResolveMergerShawn O. Pearce2012-06-141-5/+3
* Allow applications to pass ObjectInserter to MergerShawn O. Pearce2012-06-141-0/+19
* Use working tree iterator to compare file modesKevin Sawicki2012-06-051-7/+12
* Compare modes before comparing ids in ResolveMergerKevin Sawicki2012-05-091-2/+2
* Move JGitText to an internal packageRobin Rosenberg2012-03-123-3/+3
* Refactor ResolveMergerChristian Halstrick2011-12-201-59/+96
* Fix ResolveMerger not to add paths with FileMode 0Christian Halstrick2011-12-111-7/+75
* Adapt merge message to C Git for remote-tracking branchRobin Stocker2011-11-231-2/+2
* Ensure the ObjectInserter flushes after a mergeShawn O. Pearce2011-10-261-1/+4
* Fix ClassCastException in MergeCommandDenys Digtiar2011-08-212-28/+3
* Reuse ObjectReader for all objects touched during checkoutMatthias Sohn2011-08-021-12/+16
* Create a MergeResult for deleted/modified filesBernard Leach2011-05-191-0/+12
* Optimize MergeAlgorithm if ours or theirs is emptyChristian Halstrick2011-05-171-0/+31
* Fix "into" part of merge message for HEADRobin Stocker2011-05-051-2/+1
* Implemented merge for parallel delete/modificationBernard Leach2011-05-031-0/+23
* Add CHERRY_PICK_HEAD for cherry-pick conflictsRobin Stocker2011-04-061-0/+21
* Do not categorize merge failures as 'abnormal'Philipp Thun2011-03-281-9/+9
* Improve MergeResultPhilipp Thun2011-03-211-0/+11
* Abort merge when file to be checked out is dirtyPhilipp Thun2011-03-181-0/+4
* Refactor ResolveMergerPhilipp Thun2011-03-181-28/+48
* Replace 'occured' by 'occurred'Philipp Thun2011-03-151-3/+3
* Don't print "into HEAD" when merging refs/heads/masterRobin Stocker2011-02-011-1/+2
* Fix misc spelling errors in comments and method namesRobin Rosenberg2011-01-171-14/+14
* Simplify logic in StrategySimpleTwoWayInCoreShawn O. Pearce2010-12-091-7/+3
* Clarify WorkingTreeOptions and filemode usageShawn O. Pearce2010-12-081-3/+2
* Removed unread parametersChristian Halstrick2010-12-081-1/+1
* Remove empty iterator from TreeWalkShawn O. Pearce2010-12-072-3/+1
* [findbugs] Do not ignore exceptional return valueMatthias Sohn2010-12-071-2/+3
* 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
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-26 08:17:11 +0000