Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update orbit to R20220531185310 for 2022-06 | Matthias Sohn | 2022-06-06 | 17 | -26/+26 |
* | Merge branch 'master' into stable-6.2 | Matthias Sohn | 2022-06-06 | 1 | -0/+1 |
|\ | |||||
| * | [releng] Fix MANIFEST.MF of o.e.j.ssh.apache.agent | Thomas Wolf | 2022-06-06 | 1 | -0/+1 |
* | | Prepare 6.2.0-SNAPSHOT builds | Matthias Sohn | 2022-06-06 | 91 | -125/+125 |
* | | Merge branch 'master' into stable-6.2 | Andrey Loskutov | 2022-06-03 | 27 | -503/+1862 |
|\| | |||||
| * | Teach JGit to handle external diff/merge tools defined in .gitattributes | Andre Bossert | 2022-06-02 | 8 | -12/+382 |
| * | Adapt diff- and merge tool code for PGM and EGit usage | Andre Bossert | 2022-06-02 | 16 | -485/+1214 |
| * | Add availability check of pre-defined tools | Andre Bossert | 2022-06-01 | 18 | -97/+357 |
* | | JGit v6.2.0.202206011217-rc1v6.2.0.202206011217-rc1 | Matthias Sohn | 2022-06-01 | 91 | -125/+125 |
* | | Merge branch 'master' into stable-6.2 | Matthias Sohn | 2022-06-01 | 30 | -204/+3474 |
|\| | |||||
| * | Merge "Add filtering with help of DirCacheCheckout.getContent()" | Andrey Loskutov | 2022-05-30 | 12 | -257/+483 |
| |\ | |||||
| | * | Add filtering with help of DirCacheCheckout.getContent() | Andre Bossert | 2022-05-30 | 12 | -257/+483 |
| * | | Fixed since tags added for new merge constants | Andrey Loskutov | 2022-05-30 | 1 | -4/+4 |
| |/ | |||||
| * | Merge "Merge branch 'stable-6.1' into stable-6.2" | Matthias Sohn | 2022-05-28 | 0 | -0/+0 |
| |\ | |||||
| | * | Merge branch 'stable-6.1' into stable-6.2 | Matthias Sohn | 2022-05-27 | 0 | -0/+0 |
| | |\ | |||||
| * | \ | Merge "Add mergetool merge feature (execute external tool)" | Andrey Loskutov | 2022-05-27 | 11 | -185/+847 |
| |\ \ \ | |||||
| | * | | | Add mergetool merge feature (execute external tool) | Andre Bossert | 2022-05-25 | 11 | -185/+847 |
| * | | | | Merge "Add command line support for "git mergetool"" | Andrey Loskutov | 2022-05-27 | 16 | -171/+1269 |
| |\| | | | |||||
| | * | | | Add command line support for "git mergetool" | Andre Bossert | 2022-05-25 | 16 | -171/+1269 |
| * | | | | Merge "Add config reader for user-defined mergetools" | Andrey Loskutov | 2022-05-27 | 6 | -4/+483 |
| |\| | | | |||||
| | * | | | Add config reader for user-defined mergetools | Andre Bossert | 2022-05-25 | 6 | -4/+483 |
| * | | | | Merge "Add difftool compare feature (execute external tool)" | Andrey Loskutov | 2022-05-27 | 12 | -97/+894 |
| |\| | | | |||||
| | * | | | Add difftool compare feature (execute external tool) | Andre Bossert | 2022-05-25 | 12 | -97/+894 |
| * | | | | Avoid warning "no explicit project encoding" | Michael Keppler | 2022-05-26 | 4 | -0/+8 |
* | | | | | Merge branch 'stable-6.1' into stable-6.2 | Matthias Sohn | 2022-05-28 | 0 | -0/+0 |
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| | | |||||
| * | | | Merge branch 'stable-6.0' into stable-6.1 | Matthias Sohn | 2022-05-27 | 3 | -9/+39 |
| |\ \ \ | |||||
| | * \ \ | Merge branch 'stable-5.13' into stable-6.0 | Matthias Sohn | 2022-05-27 | 3 | -9/+39 |
| | |\ \ \ | |||||
| | | * | | | Remove stray files (probes or lock files) created by background threads | James Z.M. Gao | 2022-05-27 | 3 | -9/+39 |
* | | | | | | Prepare 6.2.0-SNAPSHOT builds | Matthias Sohn | 2022-05-26 | 91 | -125/+125 |
* | | | | | | JGit v6.2.0.202205251150-m3v6.2.0.202205251150-m3 | Matthias Sohn | 2022-05-25 | 91 | -125/+125 |
* | | | | | | Merge branch 'master' into stable-6.2 | Matthias Sohn | 2022-05-25 | 18 | -103/+217 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | RewriteGenerator: Fully buffering of input is no longer necessary | Simon Sohrt | 2022-05-25 | 4 | -22/+68 |
| | |_|_|/ | |/| | | | |||||
| * | | | | Update Orbit to S20220517184036 | Matthias Sohn | 2022-05-25 | 9 | -71/+71 |
| * | | | | 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 | 3 | -9/+39 |
| * | | | | Merge branch 'stable-6.2' | Matthias Sohn | 2022-05-09 | 4 | -23/+56 |
| |\ \ \ \ | |/ / / / |/| | | | | |||||
* | | | | | Merge branch 'stable-6.1' into stable-6.2 | Matthias Sohn | 2022-05-09 | 4 | -23/+56 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | HTTP Smart: set correct HTTP status on error | Sven Selberg | 2022-05-09 | 4 | -23/+56 |
| | * | | | Merge branch 'stable-6.2' | Matthias Sohn | 2022-05-05 | 0 | -0/+0 |
| | |\ \ \ | |_|/ / / |/| | | | | |||||
* | | | | | Prepare 6.2.0-SNAPSHOT builds | Matthias Sohn | 2022-05-05 | 91 | -125/+125 |
* | | | | | JGit v6.2.0.202205041315-m2v6.2.0.202205041315-m2 | Matthias Sohn | 2022-05-04 | 91 | -125/+125 |
| |/ / / |/| | | | |||||
* | | | | Update list of 3rd party dependencies | Matthias Sohn | 2022-05-03 | 1 | -24/+26 |
* | | | | Add target platforms for eclipse 4.23 (2022-03) and 4.24 (2022-06) | Matthias Sohn | 2022-05-03 | 4 | -0/+210 |
* | | | | Update Orbit to I20220502200629 | Matthias Sohn | 2022-05-02 | 15 | -33/+102 |
* | | | | [sshd] Better user feedback on authentication failure | Thomas Wolf | 2022-05-01 | 12 | -61/+586 |
* | | | | Lazy loading of .lfsconfig. | Matthias Fromme | 2022-04-30 | 1 | -21/+41 |
* | | | | [releng] bump japicmp base version | Thomas Wolf | 2022-04-25 | 1 | -1/+1 |
* | | | | RefSpec: add missing @since | Thomas Wolf | 2022-04-25 | 1 | -0/+1 |
* | | | | De-couple ServiceLoader calls from class loading | Thomas Wolf | 2022-04-14 | 2 | -28/+65 |
* | | | | CommitCommand: call GpgSigner.getDefault() only if indeed signing | Thomas Wolf | 2022-04-14 | 1 | -8/+8 |