Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | ApplyCommand: use byte arrays for text patches, not strings | Thomas Wolf | 2021-05-26 | 7 | -40/+74 |
* | ApplyCommand: support binary patches | Thomas Wolf | 2021-05-26 | 13 | -30/+467 |
* | ApplyCommand: add a stream to apply a delta patch | Thomas Wolf | 2021-05-26 | 6 | -0/+317 |
* | ApplyCommand: add streams to read/write binary patch hunks | Thomas Wolf | 2021-05-26 | 5 | -0/+383 |
* | ApplyCommand: add a base-85 codec | Thomas Wolf | 2021-05-26 | 4 | -0/+292 |
* | ApplyCommand: convert to git internal format before applying patch | Thomas Wolf | 2021-05-18 | 16 | -25/+513 |
* | SSH config: fix whitespace handling | Thomas Wolf | 2021-05-17 | 2 | -5/+25 |
* | SSH config: fix negated patterns | Thomas Wolf | 2021-05-17 | 2 | -59/+106 |
* | Fix @since tag for introduction of PUBKEY_ACCEPTED_ALGORITHMS | Matthias Sohn | 2021-05-14 | 2 | -1/+12 |
* | Merge branch 'stable-5.11' | Matthias Sohn | 2021-05-14 | 0 | -0/+0 |
|\ | |||||
| * | Prepare 5.11.2-SNAPSHOT builds | Matthias Sohn | 2021-05-14 | 88 | -503/+503 |
| * | JGit v5.11.1.202105131744-rv5.11.1.202105131744-r | Matthias Sohn | 2021-05-13 | 88 | -121/+121 |
* | | Merge branch 'stable-5.12' | Matthias Sohn | 2021-05-12 | 1 | -14/+13 |
|\ \ | |||||
| * | | Merge branch 'stable-5.11' into stable-5.12 | Matthias Sohn | 2021-05-12 | 1 | -14/+13 |
| |\| | |||||
| | * | Merge branch 'stable-5.10' into stable-5.11 | Matthias Sohn | 2021-05-12 | 1 | -14/+13 |
| | |\ | |||||
| | | * | Merge branch 'stable-5.9' into stable-5.10 | Matthias Sohn | 2021-05-12 | 1 | -14/+13 |
| | | |\ | |||||
| | | | * | Merge branch 'stable-5.8' into stable-5.9 | Matthias Sohn | 2021-05-12 | 1 | -14/+13 |
| | | | |\ | |||||
| | | | | * | Merge branch 'stable-5.7' into stable-5.8 | Matthias Sohn | 2021-05-11 | 3 | -22/+13 |
| | | | | |\ | |||||
| | | | | | * | Merge branch 'stable-5.6' into stable-5.7 | Matthias Sohn | 2021-05-11 | 3 | -22/+13 |
| | | | | | |\ | |||||
| | | | | | | * | Remove texts which were added by mistake in 00386272 | Matthias Sohn | 2021-05-11 | 2 | -8/+0 |
| | | | | | | * | Fix formatting which was broken in 00386272 | Matthias Sohn | 2021-05-11 | 1 | -14/+13 |
* | | | | | | | | Merge branch 'stable-5.12' | Matthias Sohn | 2021-05-11 | 2 | -49/+12 |
|\| | | | | | | | |||||
| * | | | | | | | Merge branch 'stable-5.11' into stable-5.12 | Matthias Sohn | 2021-05-11 | 5 | -71/+247 |
| |\| | | | | | | |||||
| | * | | | | | | Merge branch 'stable-5.10' into stable-5.11 | Matthias Sohn | 2021-05-11 | 5 | -71/+247 |
| | |\| | | | | | |||||
| | | * | | | | | Merge branch 'stable-5.9' into stable-5.10 | Matthias Sohn | 2021-05-11 | 6 | -73/+249 |
| | | |\| | | | | |||||
| | | | * | | | | Merge branch 'stable-5.8' into stable-5.9 | Matthias Sohn | 2021-05-11 | 5 | -72/+248 |
| | | | |\| | | | |||||
| | | | | * | | | Merge branch 'stable-5.7' into stable-5.8 | Matthias Sohn | 2021-05-11 | 5 | -72/+256 |
| | | | | |\| | | |||||
| | | | | | * | | Merge branch 'stable-5.6' into stable-5.7 | Matthias Sohn | 2021-05-11 | 4 | -35/+256 |
| | | | | | |\| | |||||
| | | | | | | * | LockFile: create OutputStream only when needed | Thomas Wolf | 2021-05-10 | 4 | -146/+285 |
| | | | | | * | | Remove ReftableNumbersNotIncreasingException | Han-Wen Nienhuys | 2021-03-01 | 1 | -37/+0 |
* | | | | | | | | Add a cgit interoperability test for LockFile | Matthias Sohn | 2021-05-09 | 1 | -0/+57 |
* | | | | | | | | Add TemporaryBuffer.toString(int limit) | Matthias Sohn | 2021-05-09 | 3 | -6/+22 |
* | | | | | | | | LockFile: create OutputStream only when needed | Thomas Wolf | 2021-05-07 | 4 | -44/+257 |
* | | | | | | | | Merge branch 'stable-5.12' | Matthias Sohn | 2021-05-06 | 0 | -0/+0 |
|\| | | | | | | | |||||
| * | | | | | | | Prepare 5.12.0-SNAPSHOT builds | Matthias Sohn | 2021-05-06 | 88 | -121/+121 |
| * | | | | | | | JGit v5.12.0.202105051250-m2v5.12.0.202105051250-m2 | Matthias Sohn | 2021-05-05 | 88 | -121/+121 |
|/ / / / / / / | |||||
* | | | | | | | Merge "[releng] Update eclipse-jarsigner-plugin to 1.3.1" | Matthias Sohn | 2021-04-26 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | [releng] Update eclipse-jarsigner-plugin to 1.3.1 | Thomas Wolf | 2021-04-19 | 1 | -1/+1 |
* | | | | | | | | Update jetty to 9.4.40.v20210413 | Matthias Sohn | 2021-04-23 | 18 | -335/+335 |
|/ / / / / / / | |||||
* | | | | | | | Implement ours/theirs content conflict resolution | Thomas Wolf | 2021-04-19 | 15 | -114/+1085 |
* | | | | | | | ssh: ensure list is modifiable before using Iterator.remove(). | Thomas Wolf | 2021-04-14 | 1 | -2/+2 |
* | | | | | | | Update orbit to S20210406213021 and add 4.20-staging target | Matthias Sohn | 2021-04-10 | 31 | -42/+212 |
* | | | | | | | Fix typo in test method name | Thomas Wolf | 2021-04-09 | 1 | -1/+1 |
* | | | | | | | Merge "Upgrade ecj to 3.25.0" | Matthias Sohn | 2021-04-07 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Upgrade ecj to 3.25.0 | Marco Miller | 2021-03-30 | 1 | -1/+1 |
* | | | | | | | | Allow file mode conflicts in virtual base commit on recursive merge. | Marija Savtchouk | 2021-04-06 | 2 | -9/+88 |
* | | | | | | | | sshd: don't lock the known_hosts files on reading | Thomas Wolf | 2021-04-01 | 3 | -23/+10 |
* | | | | | | | | Allow info messages in UsernamePasswordCredentialsProvider | Thomas Wolf | 2021-04-01 | 1 | -7/+17 |
* | | | | | | | | ssh config: do environment variable replacement | Thomas Wolf | 2021-04-01 | 2 | -29/+76 |
* | | | | | | | | sshd: implement server-sig-algs SSH extension (client side) | Thomas Wolf | 2021-04-01 | 6 | -15/+279 |
|/ / / / / / / |