summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* JGit v5.12.0.202105261145-m3v5.12.0.202105261145-m3Matthias Sohn2021-05-2688-121/+121
* Merge branch 'master' into stable-5.12Matthias Sohn2021-05-2661-128/+2460
|\
| * RepoCommand: Do not set 'branch' if the revision is a tagIvan Frade2021-05-262-2/+54
| * Merge "Add git config for conflict style merge/diff3"Matthias Sohn2021-05-262-0/+22
| |\
| | * Add git config for conflict style merge/diff3Thomas Wolf2021-05-032-0/+22
| * | Merge changes from topic "apply"Matthias Sohn2021-05-2647-55/+2084
| |\ \
| | * | ApplyCommand: fix "no newline at end" detectionThomas Wolf2021-05-265-2/+42
| | * | ApplyCommand: handle completely empty context lines in text patchesThomas Wolf2021-05-265-2/+40
| | * | 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
| * | | pgm: rewrite parents when --parents flag is passedkylezhao2021-05-262-0/+78
| |/ /
| * | 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
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-12 22:12:03 +0000