summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix DefaultCharset bug pattern flagged by error proneDavid Ostrovsky2022-06-175-24/+44
* Use SystemReader#getDefaultCharset to read console inputDavid Ostrovsky2022-06-171-2/+3
* Merge "Merge branch 'stable-6.2'"Matthias Sohn2022-06-176-13/+438
|\
| * Merge branch 'stable-6.2'Matthias Sohn2022-06-156-13/+438
| |\
| | * Merge branch 'stable-6.1' into stable-6.2Matthias Sohn2022-06-156-13/+438
| | |\
| | | * Merge branch 'stable-6.0' into stable-6.1Matthias Sohn2022-06-156-13/+438
| | | |\
| | | | * Merge branch 'stable-5.13' into stable-6.0Matthias Sohn2022-06-156-13/+438
| | | | |\
| | | | | * Prepare 5.13.2-SNAPSHOT buildsMatthias Sohn2022-06-1488-503/+503
| | | | | * JGit v5.13.1.202206130422-rv5.13.1.202206130422-rMatthias Sohn2022-06-1388-121/+121
| | | | | * AmazonS3: Add support for AWS API signature version 4eric.steele2022-06-136-14/+439
* | | | | | Annotate the exception with the possible failure reason when Bitmaps are not ...Ronald Bhuleskar2022-06-151-1/+7
|/ / / / /
* | | | | Fix typo in DiffTools#compare javadocMatthias Sohn2022-06-131-1/+1
* | | | | Update jgit-last-release-version to 6.2.0.202206071550-rMatthias Sohn2022-06-121-1/+1
* | | | | Merge branch 'stable-6.2'Matthias Sohn2022-06-120-0/+0
|\| | | |
| * | | | Prepare 6.2.1-SNAPSHOT buildsMatthias Sohn2022-06-0791-527/+527
| * | | | JGit v6.2.0.202206071550-rv6.2.0.202206071550-rMatthias Sohn2022-06-0791-125/+125
* | | | | Merge branch 'stable-6.2'Matthias Sohn2022-06-0719-39/+51
|\| | | |
| * | | | 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
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Prepare 6.2.0-SNAPSHOT buildsMatthias Sohn2022-06-0691-125/+125
| * | | | | | | | | Merge branch 'master' into stable-6.2Andrey Loskutov2022-06-0327-503/+1862
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | 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 branch 'stable-6.1' into stable-6.2Matthias Sohn2022-05-280-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | |
* | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \