Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | RepoProject: read the 'dest-branch' attribute of a project | Kaushik Lingarkar | 2024-07-02 | 1 | -0/+30 |
* | Merge branch 'next' | Matthias Sohn | 2024-06-04 | 5 | -7/+7 |
|\ | |||||
| * | Update minimum Java version to 17 | Matthias Sohn | 2024-05-02 | 5 | -7/+7 |
| * | Merge branch 'master' into next | Matthias Sohn | 2024-05-02 | 37 | -152/+151 |
| |\ | |||||
| * \ | Merge branch 'master' into next | Matthias Sohn | 2024-04-26 | 11 | -159/+657 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' into next | Matthias Sohn | 2024-02-21 | 165 | -934/+2011933 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' into next | Matthias Sohn | 2022-07-06 | 65 | -354/+4143 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' into next | Matthias Sohn | 2021-12-31 | 1 | -2/+38 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' into next | Thomas Wolf | 2021-12-27 | 3 | -12/+101 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Prepare 7.0.0-SNAPSHOT builds | Matthias Sohn | 2021-12-04 | 2 | -57/+57 |
* | | | | | | | | Prepare 7.0.0-SNAPSHOT builds | Matthias Sohn | 2024-06-04 | 2 | -60/+60 |
* | | | | | | | | Merge branch 'stable-6.10' | Matthias Sohn | 2024-06-04 | 2 | -60/+60 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Prepare 6.10.1-SNAPSHOT builds | Matthias Sohn | 2024-06-04 | 2 | -60/+60 |
| * | | | | | | | | JGit v6.10.0.202406032230-rv6.10.0.202406032230-r | Matthias Sohn | 2024-06-04 | 2 | -2/+2 |
| * | | | | | | | | JGit v6.10.0.202406032110-rv6.10.0.202406032110-r | Matthias Sohn | 2024-06-03 | 2 | -2/+2 |
| * | | | | | | | | Prepare 6.10.0-SNAPSHOT builds | Matthias Sohn | 2024-06-02 | 2 | -2/+2 |
| * | | | | | | | | JGit v6.10.0.202405290101-rc1v6.10.0.202405290101-rc1 | Matthias Sohn | 2024-05-29 | 2 | -2/+2 |
| * | | | | | | | | JGit v6.10.0.202405282244-rc1v6.10.0.202405282244-rc1 | Matthias Sohn | 2024-05-29 | 2 | -2/+2 |
* | | | | | | | | | CommitGraphWriter: use ANY_DIFF instead of idEquals inside next() | Ivan Frade | 2024-05-31 | 1 | -0/+2 |
* | | | | | | | | | CommitGraphWriter: Move path diff calculation to its own class | Ivan Frade | 2024-05-31 | 1 | -0/+24 |
* | | | | | | | | | RepoCommand: Copy manifest upstream into .gitmodules ref field | Ivan Frade | 2024-05-30 | 2 | -0/+133 |
* | | | | | | | | | RepoProject: read the "upstream" attribute of a project | Ivan Frade | 2024-05-30 | 1 | -0/+39 |
|/ / / / / / / / | |||||
* | | | | | | | | PatchApplier.Result.Error: mark fields final | Matthias Sohn | 2024-05-28 | 1 | -8/+6 |
* | | | | | | | | PatchApplier: Set a boolean on the result if conflict markers were added | Patrick Hiesel | 2024-05-27 | 1 | -2/+2 |
* | | | | | | | | PatchApplier: Add test for conflict markers on a deleted file | Patrick Hiesel | 2024-05-27 | 2 | -0/+20 |
* | | | | | | | | Merge changes I12e4d0fd,I082ffb20 | Matthias Sohn | 2024-05-16 | 2 | -26/+6 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix warning "Redundant specification of type arguments <Object>" | Matthias Sohn | 2024-05-14 | 2 | -26/+6 |
* | | | | | | | | | PatchApplierTest: remove unused import | Matthias Sohn | 2024-05-15 | 1 | -1/+0 |
* | | | | | | | | | Allow applying a patch with conflicts | Patrick Hiesel | 2024-05-14 | 7 | -2/+119 |
|/ / / / / / / / | |||||
* | | | | | | / | GitDateFormatterTest: Remove printlns | Ivan Frade | 2024-05-02 | 1 | -2/+0 |
| |_|_|_|_|_|/ |/| | | | | | | |||||
* | | | | | | | Bazel: Add support for JDK 21 | David Ostrovsky | 2024-05-02 | 2 | -14/+6 |
* | | | | | | | Fix warning about using raw type | Matthias Sohn | 2024-04-29 | 1 | -1/+1 |
* | | | | | | | [errorprone] Fix pattern ModifiedButNotUsed | Matthias Sohn | 2024-04-29 | 2 | -0/+4 |
* | | | | | | | [errorprone] Fix pattern CatchAndPrintStackTrace | Matthias Sohn | 2024-04-29 | 1 | -12/+13 |
* | | | | | | | [errorprone] Fix pattern FutureReturnValueIgnored | Matthias Sohn | 2024-04-29 | 3 | -8/+8 |
* | | | | | | | [errorprone] Fix pattern BadImport | Matthias Sohn | 2024-04-29 | 4 | -10/+7 |
* | | | | | | | [errorprone] Fix pattern UseCorrectAssertInTests | Matthias Sohn | 2024-04-29 | 1 | -3/+5 |
* | | | | | | | [errorprone] Fix pattern ProtectedMembersInFinalClass | Matthias Sohn | 2024-04-29 | 1 | -1/+1 |
* | | | | | | | [errorprone] Fix pattern CatchFail | Matthias Sohn | 2024-04-29 | 7 | -10/+17 |
* | | | | | | | [errorprone] Fix pattern see UnusedVariable | Matthias Sohn | 2024-04-29 | 8 | -36/+30 |
* | | | | | | | [errorprone] Fix pattern LongLiteralLowerCaseSuffix | Matthias Sohn | 2024-04-29 | 3 | -7/+7 |
* | | | | | | | [errorprone] Fix error pattern JdkObsolete | Matthias Sohn | 2024-04-29 | 4 | -11/+10 |
* | | | | | | | [errorprone] Fix UnnecessaryParentheses errors | Matthias Sohn | 2024-04-28 | 6 | -41/+44 |
| |_|_|_|_|/ |/| | | | | | |||||
* | | | | | | ResolveMerger: Fix the issue with binary modify-modify conflicts | Sruteesh | 2024-04-25 | 2 | -8/+187 |
* | | | | | | Explain why RacyGitTests may be flaky in some environments | Matthias Sohn | 2024-04-20 | 1 | -0/+16 |
* | | | | | | Merge "Add more tests on rewriting parents in a RevWalk" | Ivan Frade | 2024-04-11 | 1 | -9/+123 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add more tests on rewriting parents in a RevWalk | Max Haslbeck | 2024-03-26 | 1 | -9/+123 |
* | | | | | | | Merge "MergeAlgorithm: Fix diff3 conflict hunk computation" | Ivan Frade | 2024-04-09 | 1 | -0/+13 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | MergeAlgorithm: Fix diff3 conflict hunk computation | Antonin Delpeuch | 2024-04-09 | 1 | -0/+13 |
* | | | | | | | Merge "DfsGarbageCollectorTest: add test for bitmap index creation" | Ivan Frade | 2024-03-20 | 1 | -1/+67 |
|\ \ \ \ \ \ \ |