summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* JGit v6.3.0.202209071007-rv6.3.0.202209071007-rMatthias Sohn2022-09-0791-125/+125
* JGit v6.3.0.2022009070944-rMatthias Sohn2022-09-0791-125/+125
* [merge] Fix merge conflicts with symlinksThomas Wolf2022-09-073-53/+429
* Update DEPENDENCIES for 6.3.0Matthias Sohn2022-09-061-27/+27
* Update tycho to 2.7.5Matthias Sohn2022-09-061-1/+1
* Merge branch 'master' into stable-6.3Matthias Sohn2022-09-064-186/+110
|\
| * Merge changes I888f313f,I98de155c,I2efa9a6d,Ifa79dac2Matthias Sohn2022-09-064-186/+110
| |\
| | * Move WorkTreeUpdater to merge packageHan-Wen Nienhuys2022-09-062-5/+3
| | * WorkTreeUpdater: use DirCacheCheckout#StreamSupplierHan-Wen Nienhuys2022-09-063-130/+16
| | * DirCacheCheckout#getContent: also take InputStream supplierHan-Wen Nienhuys2022-09-062-27/+88
| | * WorkTreeUpdater: remove safeWrite optionHan-Wen Nienhuys2022-09-062-24/+3
* | | Revert "Adds FilteredRevCommit that can overwrites its parents in theMatthias Sohn2022-09-068-523/+53
* | | Revert "Option to pass start RevCommit to be blamed on to theMatthias Sohn2022-09-062-337/+39
* | | Merge branch 'master' into stable-6.3Matthias Sohn2022-09-0535-372/+1228
|\| |
| * | Update Orbit to R20220830213456 for 2022-09Matthias Sohn2022-09-0519-31/+31
| * | BaseSuperprojectWriter: report invalid paths as manifest errorsIvan Frade2022-08-232-1/+26
| |/
| * ApplyCommand: fix ApplyResult#updatedFilesHan-Wen Nienhuys2022-08-232-12/+13
| * WorkTreeUpdater: rename metadata mapsHan-Wen Nienhuys2022-08-231-10/+10
| * WorkTreeUpdater#Result: hide data membersHan-Wen Nienhuys2022-08-232-10/+23
| * Merge "WorkTreeUpdater: re-format and clean-up"Han-Wen NIenhuys2022-08-181-221/+265
| |\
| | * WorkTreeUpdater: re-format and clean-upThomas Wolf2022-08-171-221/+265
| * | Add javadoc on RevCommitRonald Bhuleskar2022-08-171-0/+5
| * | Option to pass start RevCommit to be blamed on to the BlameGenerator.Ronald Bhuleskar2022-08-172-39/+337
| * | Adds FilteredRevCommit that can overwrites its parents in the DAG.Ronald Bhuleskar2022-08-168-53/+523
* | | Prepare 6.3.0-SNAPSHOT buildsMatthias Sohn2022-08-1791-125/+125
* | | JGit v6.3.0.202208161710-m3v6.3.0.202208161710-m3Matthias Sohn2022-08-1691-125/+125
|/ /
* | Merge changes Ib6689f54,I3b5c22eeMatthias Sohn2022-08-162-31/+2
|\ \ | |/ |/|
| * Remove unused API problem filtersMatthias Sohn2022-08-121-31/+0
| * Add missing @since tag for RevCommit#parents introduced in 61b4d105e4Matthias Sohn2022-08-121-0/+2
* | DirCacheCheckout: load WorkingTreeOptions only onceThomas Wolf2022-08-145-42/+102
* | WorkTreeUpdater: Fix unclosed streamsThomas Wolf2022-08-141-12/+20
* | Merge "Fix API errors caused by 23a71696cd"Matthias Sohn2022-08-143-6/+41
|\|
| * Fix API errors caused by 23a71696cdMatthias Sohn2022-08-123-6/+41
* | Fix adding symlinks to the index when core.symlinks=falseThomas Wolf2022-08-132-0/+47
|/
* Merge "Provide encoding to String#getBytes()"Han-Wen NIenhuys2022-08-091-1/+2
|\
| * Provide encoding to String#getBytes()Han-Wen Nienhuys2022-08-081-1/+2
* | Merge changes Ideaefd51,I6c347393Han-Wen NIenhuys2022-08-095-427/+889
|\ \
| * | Reapply "Create util class for work tree updating in both filesystem and index."Nitzan Gur-Furman2022-08-084-427/+856
| * | ResolveMerger: add coverage for inCore file => directory transitionHan-Wen Nienhuys2022-08-081-0/+33
| |/
* / Provide default shallowCommits getter and setter in ObjectDatabaseRonald Bhuleskar2022-08-083-32/+15
|/
* Revert "Create util class for work tree updating in both filesystem and index."Jonathan Nieder2022-08-054-855/+426
* Provide a default implementation for set/get shallowCommits on DfsObjDatabaseRonald Bhuleskar2022-08-051-0/+16
* Merge "Revert "Option to pass start RevCommit to be blamed on to the BlameGen...Terry Parker2022-08-032-337/+39
|\
| * Revert "Option to pass start RevCommit to be blamed on to the BlameGenerator."Ronald Bhuleskar2022-08-032-337/+39
* | Merge "Revert "Adds FilteredRevCommit that can overwrites its parents in the ...Terry Parker2022-08-037-398/+21
|\ \
| * | Revert "Adds FilteredRevCommit that can overwrites its parents in the DAG."Ronald Bhuleskar2022-08-037-398/+21
* | | CleanCommand: fix prefix matchingThomas Wolf2022-08-035-18/+96
| |/ |/|
* | Option to pass start RevCommit to be blamed on to the BlameGenerator.Ronald Bhuleskar2022-08-022-39/+337
|/
* Adds FilteredRevCommit that can overwrites its parents in the DAG.Ronald Bhuleskar2022-08-027-21/+398
* Add the ability to override parents on RevCommit.Ronald Bhuleskar2022-08-0214-129/+333