aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit/src/org/eclipse/jgit/merge/RecursiveMerger.java
Commit message (Expand)AuthorAgeFilesLines
* RecursiveMerger: Create PersonIdent with java.time APIIvan Frade2024-12-231-7/+6
* RecursiveMerger: fix boxing warningMatthias Sohn2024-11-191-1/+1
* Suppress non-externalized string warningsMatthias Sohn2024-11-191-3/+3
* Record failing paths in recursive merge.jackdt@google.com2024-09-231-2/+19
* Fix all Javadoc warnings and fail on themAntoine Musso2023-06-161-0/+2
* Reapply "Create util class for work tree updating in both filesystem and index."Nitzan Gur-Furman2022-08-081-3/+0
* Revert "Create util class for work tree updating in both filesystem and index."Jonathan Nieder2022-08-051-0/+3
* Create util class for work tree updating in both filesystem and index.Nitzan Gur-Furman2022-07-251-3/+0
* Update EDL 1.0 license headers to new short SPDX compliant formatMatthias Sohn2020-01-041-38/+5
* Fix javadoc in org.eclipse.jgit merge packageMatthias Sohn2017-12-191-5/+9
* Support creating Mergers without a RepositoryDave Borowitz2017-04-051-0/+13
* Enable and fix warnings about redundant specification of type argumentsDavid Pursehouse2017-02-201-2/+2
* DirCache: Add helper to read from a treeShawn Pearce2015-11-291-30/+1
* Use AutoClosable to close resources in bundle org.eclipse.jgitMatthias Sohn2015-05-211-8/+9
* Fix RecursiveMerger in case of multiple, independent base commitsChristian Halstrick2015-03-251-4/+8
* Rename local variables/parameters to remove warnings about hidingRobin Rosenberg2014-09-041-10/+10
* ResolveMerger: Use the ObjectReader to access objectsShawn Pearce2014-08-151-1/+1
* RecursiveMerger: do not insert virtual commits into repositoryShawn Pearce2014-08-081-14/+21
* RecursiveMerger should not fail on content-merge conflicts of parentsChristian Halstrick2014-07-281-2/+1
* 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
* Remove unused logger from RecursiveMergerJonathan Nieder2013-04-261-3/+0
* Add missing @since tagsMatthias Sohn2013-03-221-2/+1
* Implement recursive merge strategyGeorge C. Young2013-02-221-0/+274
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-10 21:40:21 +0000