summaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit/src
Commit message (Expand)AuthorAgeFilesLines
* Merge "Merge branch 'stable-5.10' into stable-5.11" into stable-5.12Matthias Sohn2021-06-132-73/+16
|\
| * Merge branch 'stable-5.10' into stable-5.11Matthias Sohn2021-06-132-73/+16
| |\
| | * Merge branch 'stable-5.9' into stable-5.10Matthias Sohn2021-06-132-73/+16
| | |\
| | | * Merge branch 'stable-5.8' into stable-5.9Matthias Sohn2021-06-132-73/+16
| | | |\
| | | | * Merge branch 'stable-5.7' into stable-5.8Matthias Sohn2021-06-132-73/+16
| | | | |\
| | | | | * Merge branch 'stable-5.6' into stable-5.7Matthias Sohn2021-06-132-73/+16
| | | | | |\
| | | | | | * Merge branch 'stable-5.5' into stable-5.6Matthias Sohn2021-06-132-73/+16
| | | | | | |\
| | | | | | | * Merge branch 'stable-5.4' into stable-5.5Matthias Sohn2021-06-052-73/+16
| | | | | | | |\
| | | | | | | | * Merge branch 'stable-5.3' into stable-5.4Matthias Sohn2021-06-052-73/+16
| | | | | | | | |\
| | | | | | | | | * Merge branch 'stable-5.2' into stable-5.3Matthias Sohn2021-06-052-73/+16
| | | | | | | | | |\
| | | | | | | | | | * Merge branch 'stable-5.1' into stable-5.2Matthias Sohn2021-06-052-73/+16
| | | | | | | | | | |\
| | | | | | | | | | | * BatchRefUpdate: Skip saving conflicting ref names and prefixes in memoryKaushik Lingarkar2021-05-241-41/+13
| | | | | | | | | | | * Optimize RefDirectory.isNameConflicting()Kaushik Lingarkar2021-05-241-32/+3
* | | | | | | | | | | | [errorprone] Fix warning InputStreamSlowMultibyteReadMatthias Sohn2021-06-072-0/+10
* | | | | | | | | | | | [errorprone] Make operator precedence explicit in OpenSshConfigFileMatthias Sohn2021-06-071-2/+2
* | | | | | | | | | | | 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-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