aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit/src/org/eclipse/jgit/merge
Commit message (Expand)AuthorAgeFilesLines
* Fix ResolveMerger: rebase with autocrlf=true, direct checkoutThomas Wolf2018-08-131-17/+105
* ResolveMerger: don't try needlessly to delete directoriesThomas Wolf2018-07-191-5/+9
* Merge branch 'stable-4.11' into stable-5.0David Pursehouse2018-07-041-1/+1
|\
| * Merge branch 'stable-4.10' into stable-4.11David Pursehouse2018-07-041-1/+1
| |\
| | * Merge branch 'stable-4.9' into stable-4.10David Pursehouse2018-07-041-1/+1
| | |\
| | | * Merge branch 'stable-4.8' into stable-4.9David Pursehouse2018-07-041-1/+1
| | | |\
| | | | * Merge branch 'stable-4.7' into stable-4.8David Pursehouse2018-07-041-1/+1
| | | | |\
| | | | | * ResolveMerger: Fix encoding with string; use bytesMarco Miller2018-06-211-1/+1
* | | | | | Remove further unnecessary 'final' keywordsHan-Wen Nienhuys2018-05-181-2/+2
* | | | | | Remove 'final' in parameter listsHan-Wen Nienhuys2018-05-156-22/+22
* | | | | | Remove deprecated ResolveMerger#processEntry methodMatthias Sohn2018-03-101-55/+0
|/ / / / /
* | | | | LFS: support merge/rebase/cherry-pick/diff/compare with LFS filesMarkus Duft2018-03-031-18/+37
* | | | | Basic submodule merge handlingDavid Turner2018-02-041-6/+37
* | | | | Use a TemporaryBuffer to do a content mergeThomas Wolf2018-02-021-84/+48
* | | | | Fix index blob for merges with CRLF translationsThomas Wolf2018-02-021-5/+43
* | | | | Honor CRLF settings when writing merge resultsThomas Wolf2018-02-021-5/+23
|/ / / /
* | | | Fix javadoc in org.eclipse.jgit merge packageMatthias Sohn2017-12-1916-105/+209
* | | | Merge branch 'stable-4.9'Matthias Sohn2017-11-111-0/+56
|\| | |
| * | | Reintroduce protected method which removal broke EMF CompareMatthias Sohn2017-10-241-0/+56
* | | | Avoid loading and merging binary data in ResolveMergerHan-Wen Nienhuys2017-10-241-7/+23
|/ / /
* | | Add missing newlines at ends of Java filesDavid Pursehouse2017-07-251-1/+1
* | | Make 'inCoreLimit' of LocalFile used in ResolveMerger configurableChangcheng Xiao2017-07-221-2/+16
* | | Support -merge attribute in binary macroMathieu Cartaud2017-06-271-8/+20
|/ /
* | Fix @since tags of new API added after 4.7.0Matthias Sohn2017-04-062-0/+6
* | Support creating Mergers without a RepositoryDave Borowitz2017-04-059-21/+173
|/
* Enable and fix warnings about redundant specification of type argumentsDavid Pursehouse2017-02-206-19/+19
* Enable and fix 'Should be tagged with @Override' warningDavid Pursehouse2017-02-192-0/+5
* Organize importsDavid Pursehouse2016-11-141-1/+1
* Use FS#lastModified instead of File#lastModifiedMasaya Suzuki2016-08-241-1/+1
* MergeFormatter: Suppress warning about unchecked conversionDavid Pursehouse2016-07-261-0/+1
* Fix calling of clean/smudge filters from Checkout,MergeCommandsChristian Halstrick2016-04-222-3/+4
* Revert "Fix warnings about unchecked conversion of MergeResult"Shawn Pearce2016-02-151-1/+1
* Fix warnings about unchecked conversion of MergeResultDavid Pursehouse2016-02-151-1/+1
* Add progress monitor to MergerLaurent Delaigue2016-01-211-0/+26
* Null-annotated Ref class and fixed related compiler errorsAndrey Loskutov2015-12-151-11/+12
* DirCache: Add helper to read from a treeShawn Pearce2015-11-291-30/+1
* Null-annotated Repository class and fixed related compiler errorsAndrey Loskutov2015-11-251-5/+0
* [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
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-11 12:10:18 +0000