aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit/src/org/eclipse/jgit/merge
Commit message (Expand)AuthorAgeFilesLines
* [performance] Remove synthetic access$ methods in dfs, diff and mergeAndrey Loskutov2015-10-281-2/+2
* Fix ResolveMerger when files should be replaced by foldersChristian Halstrick2015-07-231-7/+9
* Revert "Fix unchecked conversion warning in MergeFormatter"Shawn Pearce2015-06-031-1/+1
* Delete deprecated Merger.getBaseCommit()Matthias Sohn2015-06-031-33/+0
* Fix unchecked conversion warning in MergeFormatterMatthias Sohn2015-05-291-1/+1
* Silence non-externalized string warnings in org.eclipse.jgitMatthias Sohn2015-05-263-12/+12
* Use AutoClosable to close resources in bundle org.eclipse.jgitMatthias Sohn2015-05-211-8/+9
* Use ANY_DIFF filter in ResolveMerger only for bare repositoriesMatthias Sohn2015-05-101-1/+5
* Revert "ResolveMerge only needs to visit differing TreeEntries"Christian Halstrick2015-04-101-2/+0
* Replace deprecated release() methods by close() in MergerMatthias Sohn2015-04-041-5/+5
* Fix overflow stream leak during merge conflictsShawn Pearce2015-04-011-2/+3
* Use local GIT_DIR for overflow during merge conflictsShawn Pearce2015-04-011-1/+2
* Use try-with-resources and BufferedOutputStream for local merge conflictsShawn Pearce2015-04-011-5/+5
* Optimize EolAwareOutputStream for bulk outputShawn Pearce2015-04-011-0/+8
* ResolveMerge only needs to visit differing TreeEntriesMatthias Sohn2015-03-311-0/+2
* Do not add a newline at the end if neither merged side had oneAndré de Oliveira2015-03-273-42/+234
* Fix RecursiveMerger in case of multiple, independent base commitsChristian Halstrick2015-03-251-4/+8
* 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
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-05 08:03:22 +0000