summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Prepare 6.3.0-SNAPSHOT buildsMatthias Sohn2022-06-0791-527/+527
* [releng] Fix MANIFEST.MF of o.e.j.ssh.apache.agentThomas Wolf2022-06-061-0/+1
* Teach JGit to handle external diff/merge tools defined in .gitattributesAndre Bossert2022-06-028-12/+382
* Adapt diff- and merge tool code for PGM and EGit usageAndre Bossert2022-06-0216-485/+1214
* Add availability check of pre-defined toolsAndre Bossert2022-06-0118-97/+357
* Merge "Add filtering with help of DirCacheCheckout.getContent()"Andrey Loskutov2022-05-3012-257/+483
|\
| * Add filtering with help of DirCacheCheckout.getContent()Andre Bossert2022-05-3012-257/+483
* | Fixed since tags added for new merge constantsAndrey Loskutov2022-05-301-4/+4
|/
* Merge "Merge branch 'stable-6.1' into stable-6.2"Matthias Sohn2022-05-280-0/+0
|\
| * Merge branch 'stable-6.1' into stable-6.2Matthias Sohn2022-05-270-0/+0
| |\
| | * Merge branch 'stable-6.0' into stable-6.1Matthias Sohn2022-05-273-9/+39
| | |\
| | | * Merge branch 'stable-5.13' into stable-6.0Matthias Sohn2022-05-273-9/+39
| | | |\
| | | | * Remove stray files (probes or lock files) created by background threadsJames Z.M. Gao2022-05-273-9/+39
| * | | | Prepare 6.2.0-SNAPSHOT buildsMatthias Sohn2022-05-2691-125/+125
| * | | | JGit v6.2.0.202205251150-m3v6.2.0.202205251150-m3Matthias Sohn2022-05-2591-125/+125
| * | | | Merge branch 'master' into stable-6.2Matthias Sohn2022-05-2518-103/+217
| |\ \ \ \
* | \ \ \ \ Merge "Add mergetool merge feature (execute external tool)"Andrey Loskutov2022-05-2711-185/+847
|\ \ \ \ \ \
| * | | | | | Add mergetool merge feature (execute external tool)Andre Bossert2022-05-2511-185/+847
* | | | | | | Merge "Add command line support for "git mergetool""Andrey Loskutov2022-05-2716-171/+1269
|\| | | | | |
| * | | | | | Add command line support for "git mergetool"Andre Bossert2022-05-2516-171/+1269
* | | | | | | Merge "Add config reader for user-defined mergetools"Andrey Loskutov2022-05-276-4/+483
|\| | | | | |
| * | | | | | Add config reader for user-defined mergetoolsAndre Bossert2022-05-256-4/+483
* | | | | | | Merge "Add difftool compare feature (execute external tool)"Andrey Loskutov2022-05-2712-97/+894
|\| | | | | |
| * | | | | | Add difftool compare feature (execute external tool)Andre Bossert2022-05-2512-97/+894
* | | | | | | Avoid warning "no explicit project encoding"Michael Keppler2022-05-264-0/+8
| |_|/ / / / |/| | | | |
* | | | | | RewriteGenerator: Fully buffering of input is no longer necessarySimon Sohrt2022-05-254-22/+68
|/ / / / /
* | | | | Update Orbit to S20220517184036Matthias Sohn2022-05-259-71/+71
* | | | | PackFileSnapshot: Resolve warnings by using "equals" instead of "=="Fabio Ponciroli2022-05-202-1/+39
* | | | | Remove stray files (probes or lock files) created by background threadsJames Z.M. Gao2022-05-153-9/+39
* | | | | Merge branch 'stable-6.2'Matthias Sohn2022-05-094-23/+56
|\| | | |
| * | | | Merge branch 'stable-6.1' into stable-6.2Matthias Sohn2022-05-094-23/+56
| |\| | |
| | * | | HTTP Smart: set correct HTTP status on errorSven Selberg2022-05-094-23/+56
* | | | | Merge branch 'stable-6.2'Matthias Sohn2022-05-050-0/+0
|\| | | |
| * | | | Prepare 6.2.0-SNAPSHOT buildsMatthias Sohn2022-05-0591-125/+125
| * | | | JGit v6.2.0.202205041315-m2v6.2.0.202205041315-m2Matthias Sohn2022-05-0491-125/+125
|/ / / /
* | | | Update list of 3rd party dependenciesMatthias Sohn2022-05-031-24/+26
* | | | Add target platforms for eclipse 4.23 (2022-03) and 4.24 (2022-06)Matthias Sohn2022-05-034-0/+210
* | | | Update Orbit to I20220502200629Matthias Sohn2022-05-0215-33/+102
* | | | [sshd] Better user feedback on authentication failureThomas Wolf2022-05-0112-61/+586
* | | | Lazy loading of .lfsconfig.Matthias Fromme2022-04-301-21/+41
* | | | [releng] bump japicmp base versionThomas Wolf2022-04-251-1/+1
* | | | RefSpec: add missing @sinceThomas Wolf2022-04-251-0/+1
* | | | De-couple ServiceLoader calls from class loadingThomas Wolf2022-04-142-28/+65
* | | | CommitCommand: call GpgSigner.getDefault() only if indeed signingThomas Wolf2022-04-141-8/+8
* | | | GpgSigner: prevent class lock inversion on the default signerThomas Wolf2022-04-141-14/+30
* | | | Fetch: Introduce negative refspecs.yunjieli2022-04-137-8/+211
* | | | Merge "Add GetRefsBenchmark for testing refs lookups"Han-Wen NIenhuys2022-04-051-0/+181
|\ \ \ \
| * | | | Add GetRefsBenchmark for testing refs lookupsLuca Milanesio2022-04-011-0/+181
* | | | | BaseSearch: Suppress ReferenceEquality WarningsFabio Ponciroli2022-04-021-0/+1
* | | | | RewriteGenerator: Suppress ReferenceEquality WarningsFabio Ponciroli2022-04-011-0/+1
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-23 14:50:53 +0000