aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit/src
Commit message (Expand)AuthorAgeFilesLines
* 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-262-30/+247
* | ApplyCommand: add a stream to apply a delta patchThomas Wolf2021-05-262-0/+209
* | ApplyCommand: add streams to read/write binary patch hunksThomas Wolf2021-05-263-0/+233
* | ApplyCommand: add a base-85 codecThomas Wolf2021-05-262-0/+200
* | 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-141-1/+1
* | 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-112-18/+13
| | | | | |\ \
| | | | | | * \ Merge branch 'stable-5.6' into stable-5.7Matthias Sohn2021-05-112-18/+13
| | | | | | |\ \
| | | | | | | * | Remove texts which were added by mistake in 00386272Matthias Sohn2021-05-111-4/+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-113-70/+92
| |\| | | | | | | | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | Merge branch 'stable-5.10' into stable-5.11Matthias Sohn2021-05-113-70/+92
| | |\| | | | |
| | | * | | | | Merge branch 'stable-5.9' into stable-5.10Matthias Sohn2021-05-113-71/+93
| | | |\| | | |
| | | | * | | | Merge branch 'stable-5.8' into stable-5.9Matthias Sohn2021-05-113-71/+93
| | | | |\| | |
| | | | | * | | Merge branch 'stable-5.7' into stable-5.8Matthias Sohn2021-05-113-71/+97
| | | | | |\| |
| | | | | | * | Merge branch 'stable-5.6' into stable-5.7Matthias Sohn2021-05-112-34/+97
| | | | | | |\|
| | | | | | | * LockFile: create OutputStream only when neededThomas Wolf2021-05-102-108/+105
| | | | | | * | Remove ReftableNumbersNotIncreasingExceptionHan-Wen Nienhuys2021-03-011-37/+0
* | | | | | | | Add TemporaryBuffer.toString(int limit)Matthias Sohn2021-05-093-6/+22
* | | | | | | | LockFile: create OutputStream only when neededThomas Wolf2021-05-072-43/+102
|/ / / / / / /
* | | | | | | 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-264-101/+166
|\| | | | | |
| * | | | | | Refactor CommitCommand to improve readabilityMatthias Sohn2021-03-231-72/+90
| * | | | | | CommitCommand: fix formattingMatthias Sohn2021-03-231-2/+1
| * | | | | | CommitCommand: remove unncessary commentMatthias Sohn2021-03-231-1/+0
| * | | | | | Ensure post-commit hook is called after index lock was releasedMatthias Sohn2021-03-232-6/+18
| * | | | | | sshd: modernize ssh config file parsingThomas Wolf2021-03-191-22/+51
| * | | | | | sshd: implement ssh config PubkeyAcceptedAlgorithmsThomas Wolf2021-03-191-0/+8
* | | | | | | Optimize RevWalkUtils.findBranchesReachableFrom()Adithya Chakilam2021-03-142-10/+41
* | | | | | | Introduce getMergedInto(RevCommit commit, Collection<Ref> refs)Adithya Chakilam2021-03-141-0/+114
* | | | | | | Skip detecting content renames for large filesYoussef Elghareeb2021-03-142-0/+44
* | | | | | | HTTP cookies: do tilde expansion on http.cookieFileThomas Wolf2021-03-122-8/+20
|/ / / / / /
* | | | | | PackFile: Add id + ext based constructorsNasser Grainawi2021-03-076-34/+70