Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | JGit blame very slow for large merge commits that rename files | Simeon Andreev | 2022-07-01 | 3 | -3/+143 |
* | Fix warnings about non-externalized string literals | Thomas Wolf | 2022-06-23 | 1 | -4/+4 |
* | Run tests that checks araxis output only on Linux | Simeon Andreev | 2022-06-17 | 1 | -0/+17 |
* | Suppress API errors raised for new API introduced in 5.13.1 | Matthias Sohn | 2022-06-17 | 1 | -14/+24 |
* | Fix DefaultCharset bug pattern flagged by error prone | David Ostrovsky | 2022-06-17 | 2 | -5/+11 |
* | Merge "Merge branch 'stable-6.2'" | Matthias Sohn | 2022-06-17 | 5 | -13/+429 |
|\ | |||||
| * | Merge branch 'stable-6.2' | Matthias Sohn | 2022-06-15 | 5 | -13/+429 |
| |\ | |||||
| | * | Merge branch 'stable-6.1' into stable-6.2 | Matthias Sohn | 2022-06-15 | 5 | -13/+429 |
| | |\ | |||||
| | | * | Merge branch 'stable-6.0' into stable-6.1 | Matthias Sohn | 2022-06-15 | 5 | -13/+429 |
| | | |\ | |||||
| | | | * | Merge branch 'stable-5.13' into stable-6.0 | Matthias Sohn | 2022-06-15 | 5 | -13/+429 |
| | | | |\ | |||||
| | | | | * | Prepare 5.13.2-SNAPSHOT builds | Matthias Sohn | 2022-06-14 | 3 | -54/+54 |
| | | | | * | JGit v5.13.1.202206130422-rv5.13.1.202206130422-r | Matthias Sohn | 2022-06-13 | 3 | -4/+4 |
| | | | | * | AmazonS3: Add support for AWS API signature version 4 | eric.steele | 2022-06-13 | 5 | -14/+430 |
| | * | | | | Prepare 6.2.1-SNAPSHOT builds | Matthias Sohn | 2022-06-07 | 3 | -55/+55 |
| | * | | | | JGit v6.2.0.202206071550-rv6.2.0.202206071550-r | Matthias Sohn | 2022-06-07 | 3 | -4/+4 |
* | | | | | | Annotate the exception with the possible failure reason when Bitmaps are not ... | Ronald Bhuleskar | 2022-06-15 | 1 | -1/+7 |
|/ / / / / | |||||
* | | | | | Fix typo in DiffTools#compare javadoc | Matthias Sohn | 2022-06-13 | 1 | -1/+1 |
* | | | | | Merge branch 'stable-6.2' | Matthias Sohn | 2022-06-07 | 1 | -12/+24 |
|\| | | | | |||||
| * | | | | Merge branch 'stable-6.1' into stable-6.2 | Matthias Sohn | 2022-06-07 | 1 | -12/+24 |
| |\| | | | |||||
| | * | | | Merge branch 'stable-6.0' into stable-6.1 | Matthias Sohn | 2022-06-07 | 1 | -12/+24 |
| | |\| | | |||||
| | | * | | Merge branch 'stable-5.13' into stable-6.0 | Matthias Sohn | 2022-06-07 | 1 | -12/+24 |
| | | |\| | |||||
| | | | * | Merge branch 'stable-5.12' into stable-5.13 | Matthias Sohn | 2022-06-07 | 1 | -12/+24 |
| | | | |\ | |||||
| | | | | * | Merge branch 'stable-5.11' into stable-5.12 | Matthias Sohn | 2022-06-07 | 1 | -12/+24 |
| | | | | |\ | |||||
| | | | | | * | Merge branch 'stable-5.10' into stable-5.11 | Matthias Sohn | 2022-06-07 | 1 | -12/+24 |
| | | | | | |\ | |||||
| | | | | | | * | Merge branch 'stable-5.9' into stable-5.10 | Matthias Sohn | 2022-06-07 | 1 | -11/+23 |
| | | | | | | |\ | |||||
| | | | | | | | * | Fix connection leak for smart http connections | Saša Živkov | 2022-06-06 | 1 | -11/+23 |
| | * | | | | | | | Merge branch 'stable-6.0' into stable-6.1 | Matthias Sohn | 2022-05-27 | 2 | -9/+27 |
| | |\| | | | | | | |||||
| | | * | | | | | | Merge branch 'stable-5.13' into stable-6.0 | Matthias Sohn | 2022-05-27 | 2 | -9/+27 |
| | | |\| | | | | | |||||
| | | | * | | | | | Remove stray files (probes or lock files) created by background threads | James Z.M. Gao | 2022-05-27 | 2 | -9/+27 |
| * | | | | | | | | Prepare 6.2.0-SNAPSHOT builds | Matthias Sohn | 2022-06-06 | 3 | -4/+4 |
| * | | | | | | | | Merge branch 'master' into stable-6.2 | Andrey Loskutov | 2022-06-03 | 17 | -217/+907 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | JGit v6.2.0.202206011217-rc1v6.2.0.202206011217-rc1 | Matthias Sohn | 2022-06-01 | 3 | -4/+4 |
* | | | | | | | | | | Prepare 6.3.0-SNAPSHOT builds | Matthias Sohn | 2022-06-07 | 3 | -55/+55 |
| |/ / / / / / / / |/| | | | | | | | | |||||
* | | | | | | | | | Teach JGit to handle external diff/merge tools defined in .gitattributes | Andre Bossert | 2022-06-02 | 5 | -8/+191 |
* | | | | | | | | | Adapt diff- and merge tool code for PGM and EGit usage | Andre Bossert | 2022-06-02 | 8 | -224/+550 |
* | | | | | | | | | Add availability check of pre-defined tools | Andre Bossert | 2022-06-01 | 10 | -26/+207 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge "Add filtering with help of DirCacheCheckout.getContent()" | Andrey Loskutov | 2022-05-30 | 5 | -134/+282 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add filtering with help of DirCacheCheckout.getContent() | Andre Bossert | 2022-05-30 | 5 | -134/+282 |
* | | | | | | | | | Fixed since tags added for new merge constants | Andrey Loskutov | 2022-05-30 | 1 | -4/+4 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge "Add mergetool merge feature (execute external tool)" | Andrey Loskutov | 2022-05-27 | 4 | -65/+178 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add mergetool merge feature (execute external tool) | Andre Bossert | 2022-05-25 | 4 | -65/+178 |
* | | | | | | | | | Merge "Add command line support for "git mergetool"" | Andrey Loskutov | 2022-05-27 | 8 | -52/+573 |
|\| | | | | | | | | |||||
| * | | | | | | | | Add command line support for "git mergetool" | Andre Bossert | 2022-05-25 | 8 | -52/+573 |
* | | | | | | | | | Merge "Add config reader for user-defined mergetools" | Andrey Loskutov | 2022-05-27 | 5 | -4/+374 |
|\| | | | | | | | | |||||
| * | | | | | | | | Add config reader for user-defined mergetools | Andre Bossert | 2022-05-25 | 5 | -4/+374 |
* | | | | | | | | | Merge "Add difftool compare feature (execute external tool)" | Andrey Loskutov | 2022-05-27 | 7 | -40/+624 |
|\| | | | | | | | | |||||
| * | | | | | | | | Add difftool compare feature (execute external tool) | Andre Bossert | 2022-05-25 | 7 | -40/+624 |
* | | | | | | | | | RewriteGenerator: Fully buffering of input is no longer necessary | Simon Sohrt | 2022-05-25 | 4 | -22/+68 |
|/ / / / / / / / | |||||
* | | | | | | | | PackFileSnapshot: Resolve warnings by using "equals" instead of "==" | Fabio Ponciroli | 2022-05-20 | 2 | -1/+39 |
* | | | | | | | | Remove stray files (probes or lock files) created by background threads | James Z.M. Gao | 2022-05-15 | 2 | -9/+27 |