summaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit
Commit message (Expand)AuthorAgeFilesLines
* JGit v5.12.0.202106011439-rc1v5.12.0.202106011439-rc1Matthias Sohn2021-06-013-4/+4
* Merge "Skip detecting content renames for binary files"Han-Wen NIenhuys2021-05-313-7/+60
|\
| * Skip detecting content renames for binary filesYoussef Elghareeb2021-05-313-7/+60
* | RepoCommand: Retry commit on LockFailureIvan Frade2021-05-261-43/+67
* | RepoCommand: Do not set 'branch' if the revision is a tagIvan Frade2021-05-261-2/+6
* | 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
* | | ApplyCommand: fix "no newline at end" detectionThomas Wolf2021-05-261-1/+5
* | | ApplyCommand: handle completely empty context lines in text patchesThomas Wolf2021-05-261-2/+14
* | | ApplyCommand: use byte arrays for text patches, not stringsThomas Wolf2021-05-262-39/+55
* | | ApplyCommand: support binary patchesThomas Wolf2021-05-263-30/+250
* | | ApplyCommand: add a stream to apply a delta patchThomas Wolf2021-05-263-0/+212
* | | ApplyCommand: add streams to read/write binary patch hunksThomas Wolf2021-05-264-0/+237
* | | ApplyCommand: add a base-85 codecThomas Wolf2021-05-263-0/+205
* | | ApplyCommand: convert to git internal format before applying patchThomas Wolf2021-05-181-24/+255
| |/ |/|
* | SSH config: fix whitespace handlingThomas Wolf2021-05-171-5/+8
* | SSH config: fix negated patternsThomas Wolf2021-05-171-58/+50
* | Fix @since tag for introduction of PUBKEY_ACCEPTED_ALGORITHMSMatthias Sohn2021-05-142-1/+12
* | 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-114-70/+95
| |\| | | | | | |
| | * | | | | | | Merge branch 'stable-5.10' into stable-5.11Matthias Sohn2021-05-114-70/+95
| | |\| | | | | |
| | | * | | | | | Merge branch 'stable-5.9' into stable-5.10Matthias Sohn2021-05-115-72/+97
| | | |\| | | | |
| | | | * | | | | Merge branch 'stable-5.8' into stable-5.9Matthias Sohn2021-05-114-71/+96
| | | | |\| | | |
| | | | | * | | | Merge branch 'stable-5.7' into stable-5.8Matthias Sohn2021-05-114-71/+104
| | | | | |\| | |
| | | | | | * | | Merge branch 'stable-5.6' into stable-5.7Matthias Sohn2021-05-113-34/+104
| | | | | | |\| |
| | | | | | | * | LockFile: create OutputStream only when neededThomas Wolf2021-05-103-108/+112
| | | | | | * | | Remove ReftableNumbersNotIncreasingExceptionHan-Wen Nienhuys2021-03-011-37/+0
| | | * | | | | | Prepare 5.10.1-SNAPSHOT buildsMatthias Sohn2020-12-083-56/+56
| | | * | | | | | JGit v5.10.0.202012080955-rv5.10.0.202012080955-rMatthias Sohn2020-12-083-4/+4
| | | * | | | | | Prepare 5.10.0-SNAPSHOT buildsMatthias Sohn2020-12-023-4/+4
| | | * | | | | | JGit v5.10.0.202012021225-rc1v5.10.0.202012021225-rc1Matthias Sohn2020-12-023-4/+4
| * | | | | | | | Prepare 5.12.0-SNAPSHOT buildsMatthias Sohn2021-05-063-4/+4
| * | | | | | | | JGit v5.12.0.202105051250-m2v5.12.0.202105051250-m2Matthias Sohn2021-05-053-4/+4
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Add TemporaryBuffer.toString(int limit)Matthias Sohn2021-05-093-6/+22
* | | | | | | | LockFile: create OutputStream only when neededThomas Wolf2021-05-073-43/+105
|/ / / / / / /
* | | | | | | Implement ours/theirs content conflict resolutionThomas Wolf2021-04-198-100/+400
* | | | | | | Allow file mode conflicts in virtual base commit on recursive merge.Marija Savtchouk2021-04-061-9/+12
* | | | | | | Allow info messages in UsernamePasswordCredentialsProviderThomas Wolf2021-04-011-7/+17
* | | | | | | ssh config: do environment variable replacementThomas Wolf2021-04-011-29/+56
* | | | | | | Merge branch 'stable-5.11'Matthias Sohn2021-03-265-101/+167
|\| | | | | |
| * | | | | | Refactor CommitCommand to improve readabilityMatthias Sohn2021-03-231-72/+90