summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* ApplyCommand: use byte arrays for text patches, not stringsThomas Wolf2021-05-267-40/+74
* ApplyCommand: support binary patchesThomas Wolf2021-05-2613-30/+467
* ApplyCommand: add a stream to apply a delta patchThomas Wolf2021-05-266-0/+317
* ApplyCommand: add streams to read/write binary patch hunksThomas Wolf2021-05-265-0/+383
* ApplyCommand: add a base-85 codecThomas Wolf2021-05-264-0/+292
* ApplyCommand: convert to git internal format before applying patchThomas Wolf2021-05-1816-25/+513
* SSH config: fix whitespace handlingThomas Wolf2021-05-172-5/+25
* SSH config: fix negated patternsThomas Wolf2021-05-172-59/+106
* Fix @since tag for introduction of PUBKEY_ACCEPTED_ALGORITHMSMatthias Sohn2021-05-142-1/+12
* Merge branch 'stable-5.11'Matthias Sohn2021-05-140-0/+0
|\
| * Prepare 5.11.2-SNAPSHOT buildsMatthias Sohn2021-05-1488-503/+503
| * JGit v5.11.1.202105131744-rv5.11.1.202105131744-rMatthias Sohn2021-05-1388-121/+121
* | Merge branch 'stable-5.12'Matthias Sohn2021-05-121-14/+13
|\ \
| * | Merge branch 'stable-5.11' into stable-5.12Matthias Sohn2021-05-121-14/+13
| |\|
| | * Merge branch 'stable-5.10' into stable-5.11Matthias Sohn2021-05-121-14/+13
| | |\
| | | * Merge branch 'stable-5.9' into stable-5.10Matthias Sohn2021-05-121-14/+13
| | | |\
| | | | * Merge branch 'stable-5.8' into stable-5.9Matthias Sohn2021-05-121-14/+13
| | | | |\
| | | | | * Merge branch 'stable-5.7' into stable-5.8Matthias Sohn2021-05-113-22/+13
| | | | | |\
| | | | | | * Merge branch 'stable-5.6' into stable-5.7Matthias Sohn2021-05-113-22/+13
| | | | | | |\
| | | | | | | * Remove texts which were added by mistake in 00386272Matthias Sohn2021-05-112-8/+0
| | | | | | | * Fix formatting which was broken in 00386272Matthias Sohn2021-05-111-14/+13
* | | | | | | | Merge branch 'stable-5.12'Matthias Sohn2021-05-112-49/+12
|\| | | | | | |
| * | | | | | | Merge branch 'stable-5.11' into stable-5.12Matthias Sohn2021-05-115-71/+247
| |\| | | | | |
| | * | | | | | Merge branch 'stable-5.10' into stable-5.11Matthias Sohn2021-05-115-71/+247
| | |\| | | | |
| | | * | | | | Merge branch 'stable-5.9' into stable-5.10Matthias Sohn2021-05-116-73/+249
| | | |\| | | |
| | | | * | | | Merge branch 'stable-5.8' into stable-5.9Matthias Sohn2021-05-115-72/+248
| | | | |\| | |
| | | | | * | | Merge branch 'stable-5.7' into stable-5.8Matthias Sohn2021-05-115-72/+256
| | | | | |\| |
| | | | | | * | Merge branch 'stable-5.6' into stable-5.7Matthias Sohn2021-05-114-35/+256
| | | | | | |\|
| | | | | | | * LockFile: create OutputStream only when neededThomas Wolf2021-05-104-146/+285
| | | | | | * | Remove ReftableNumbersNotIncreasingExceptionHan-Wen Nienhuys2021-03-011-37/+0
* | | | | | | | Add a cgit interoperability test for LockFileMatthias Sohn2021-05-091-0/+57
* | | | | | | | Add TemporaryBuffer.toString(int limit)Matthias Sohn2021-05-093-6/+22
* | | | | | | | LockFile: create OutputStream only when neededThomas Wolf2021-05-074-44/+257
* | | | | | | | Merge branch 'stable-5.12'Matthias Sohn2021-05-060-0/+0
|\| | | | | | |
| * | | | | | | Prepare 5.12.0-SNAPSHOT buildsMatthias Sohn2021-05-0688-121/+121
| * | | | | | | JGit v5.12.0.202105051250-m2v5.12.0.202105051250-m2Matthias Sohn2021-05-0588-121/+121
|/ / / / / / /
* | | | | | | Merge "[releng] Update eclipse-jarsigner-plugin to 1.3.1"Matthias Sohn2021-04-261-1/+1
|\ \ \ \ \ \ \
| * | | | | | | [releng] Update eclipse-jarsigner-plugin to 1.3.1Thomas Wolf2021-04-191-1/+1
* | | | | | | | Update jetty to 9.4.40.v20210413Matthias Sohn2021-04-2318-335/+335
|/ / / / / / /
* | | | | | | Implement ours/theirs content conflict resolutionThomas Wolf2021-04-1915-114/+1085
* | | | | | | ssh: ensure list is modifiable before using Iterator.remove().Thomas Wolf2021-04-141-2/+2
* | | | | | | Update orbit to S20210406213021 and add 4.20-staging targetMatthias Sohn2021-04-1031-42/+212
* | | | | | | Fix typo in test method nameThomas Wolf2021-04-091-1/+1
* | | | | | | Merge "Upgrade ecj to 3.25.0"Matthias Sohn2021-04-071-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Upgrade ecj to 3.25.0Marco Miller2021-03-301-1/+1
* | | | | | | | Allow file mode conflicts in virtual base commit on recursive merge.Marija Savtchouk2021-04-062-9/+88
* | | | | | | | sshd: don't lock the known_hosts files on readingThomas Wolf2021-04-013-23/+10
* | | | | | | | Allow info messages in UsernamePasswordCredentialsProviderThomas Wolf2021-04-011-7/+17
* | | | | | | | ssh config: do environment variable replacementThomas Wolf2021-04-012-29/+76
* | | | | | | | sshd: implement server-sig-algs SSH extension (client side)Thomas Wolf2021-04-016-15/+279
|/ / / / / / /