summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* JGit v6.2.0.202206071550-rv6.2.0.202206071550-rMatthias Sohn2022-06-0791-125/+125
* Merge branch 'stable-6.1' into stable-6.2Matthias Sohn2022-06-071-12/+24
|\
| * Merge branch 'stable-6.0' into stable-6.1Matthias Sohn2022-06-071-12/+24
| |\
| | * Merge branch 'stable-5.13' into stable-6.0Matthias Sohn2022-06-071-12/+24
| | |\
| | | * Merge branch 'stable-5.12' into stable-5.13Matthias Sohn2022-06-071-12/+24
| | | |\
| | | | * Merge branch 'stable-5.11' into stable-5.12Matthias Sohn2022-06-071-12/+24
| | | | |\
| | | | | * Merge branch 'stable-5.10' into stable-5.11Matthias Sohn2022-06-071-12/+24
| | | | | |\
| | | | | | * Merge branch 'stable-5.9' into stable-5.10Matthias Sohn2022-06-071-11/+23
| | | | | | |\
| | | | | | | * Fix connection leak for smart http connectionsSaša Živkov2022-06-061-11/+23
* | | | | | | | Update DEPENDENCIES for 6.2.0 to be released with 2022-06Matthias Sohn2022-06-061-1/+1
* | | | | | | | Update orbit to R20220531185310 for 2022-06Matthias Sohn2022-06-0617-26/+26
* | | | | | | | Merge branch 'master' into stable-6.2Matthias Sohn2022-06-061-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | [releng] Fix MANIFEST.MF of o.e.j.ssh.apache.agentThomas Wolf2022-06-061-0/+1
* | | | | | | | | Prepare 6.2.0-SNAPSHOT buildsMatthias Sohn2022-06-0691-125/+125
* | | | | | | | | Merge branch 'master' into stable-6.2Andrey Loskutov2022-06-0327-503/+1862
|\| | | | | | | |
| * | | | | | | | 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
* | | | | | | | | JGit v6.2.0.202206011217-rc1v6.2.0.202206011217-rc1Matthias Sohn2022-06-0191-125/+125
* | | | | | | | | Merge branch 'master' into stable-6.2Matthias Sohn2022-06-0130-204/+3474
|\| | | | | | | |
| * | | | | | | | 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 "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
* | | | | | | | | | | Merge branch 'stable-6.1' into stable-6.2Matthias Sohn2022-05-280-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
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | 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
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-03 06:49:39 +0000