aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit/src/org/eclipse/jgit/merge
Commit message (Expand)AuthorAgeFilesLines
* ResolveMerger: Use checkoutEntry during abortShawn Pearce2014-11-271-9/+2
* Deprecate checkoutEntry variant that accepts FileShawn Pearce2014-11-271-21/+4
* Rename local variables/parameters to remove warnings about hidingRobin Rosenberg2014-09-041-10/+10
* ResolveMerger: Use the ObjectReader to access objectsShawn Pearce2014-08-152-7/+8
* 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
* Reuse Merger's ObjectReader from ResolveMergerDave Borowitz2014-08-111-26/+19
* Process most in-core merges without local temp filesShawn Pearce2014-08-081-62/+67
* ResolveMerger: push result file creation into updateIndex()Shawn Pearce2014-08-081-4/+3
* RecursiveMerger: do not insert virtual commits into repositoryShawn Pearce2014-08-081-14/+21
* Fix Javadoc errors with Java 8Robin Stocker2014-08-021-0/+1
* Fix API errors raised on ResolveMerger affecting API providers onlyChristian Halstrick2014-07-312-3/+4
* RecursiveMerger should not fail on content-merge conflicts of parentsChristian Halstrick2014-07-283-9/+51
* Fixed message for exception thrown during recursive mergeChristian Halstrick2014-07-281-4/+2
* Fix RecursiveMerger's internal use of merge to find a merge baseChristian Halstrick2014-07-251-0/+6
* Merge "Make the resolve merger slightly more sub-classable."Robin Rosenberg2014-05-051-29/+125
|\
| * Make the resolve merger slightly more sub-classable.Laurent Goubet2014-03-061-29/+125
* | Cleanup javadocs so they pass the java8 doclint checksRobin Rosenberg2014-03-291-1/+1
|/
* Fix merge/cherry-picking in CRLF modeRobin Rosenberg2014-03-021-8/+15
* Use branch.<x>.mergeoptions and merge.ff as defaults for mergingKonrad Kügler2014-02-141-0/+189
* Add symlink support to JGitRobin Rosenberg2014-02-101-4/+6
* Failing to delete a directory with untracked content is actually okRobin Rosenberg2014-02-101-2/+3
* Fix exception on conflicts with recursive mergeRobin Stocker2013-12-033-21/+34
* Remove unused logger from RecursiveMergerJonathan Nieder2013-04-261-3/+0
* A deleted work tree file is not a conflict when merge wants to delete itRobin Rosenberg2013-04-081-1/+5
* Add missing @since tagsMatthias Sohn2013-03-224-2/+14
* Fix @since tags in JGit, version 2.4 never existedTomasz Zarna2013-03-211-0/+2
* A folder does not constitute a dirty work treeRobin Rosenberg2013-03-101-1/+4
* Implement recursive merge strategyGeorge C. Young2013-02-226-92/+526
* Add conflicts message before footerStefan Lay2013-01-191-6/+19
* Mark non-externalizable strings as suchRobin Rosenberg2012-12-277-31/+31
* Add Javadoc description for packagesRobin Stocker2012-10-311-0/+4
* Fix ResolveMerger issue with submodule conflictTommi Siivola2012-09-121-0/+13
* Again teach ResolveMerger to create more correct DirCacheEntry'sChristian Halstrick2012-07-261-35/+81
* Revert "Teach ResolveMerger to create more correct DirCacheEntry's"Shawn Pearce2012-07-241-74/+26
* Teach ResolveMerger to create more correct DirCacheEntry'sMarkus Duft2012-07-191-26/+74
* Fix order of deletion for files/dirs in ResolveMergerRobin Stocker2012-06-231-9/+16
* Don't return success on failing paths in ResolveMergerRobin Stocker2012-06-231-1/+1
* 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
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-06 05:43:15 +0000