summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | Switch to Apache MINA sshd 2.8.0Thomas Wolf2022-01-0721-155/+209
* | | | | | Merge changes Ia744cd4a,Id95350c7,I746b7fb7Thomas Wolf2022-01-0633-140/+187
|\ \ \ \ \ \
| * | | | | | sshd: backport upstream fix for SSHD-1231Thomas Wolf2022-01-062-0/+40
| * | | | | | [releng] bump japicmp base version and configure sshd bundlesThomas Wolf2022-01-053-5/+13
| * | | | | | Merge branch 'stable-6.0'Thomas Wolf2022-01-0529-135/+134
| |\| | | | |
| | * | | | | Merge branch 'stable-5.13' into stable-6.0Thomas Wolf2022-01-0529-135/+134
| | |\| | | |
| | | * | | | Use slf4j-simple instead of log4j for loggingMatthias Sohn2021-12-3132-177/+84
| | | * | | | Update orbit to R20211213173813Matthias Sohn2021-12-3136-285/+354
* | | | | | | Add myself to .mailmapSebastian Schuberth2022-01-061-0/+1
|/ / / / / /
* | | | | / Merge branch 'stable-6.0'Matthias Sohn2021-12-313-5/+62
|\| | | | | | |_|_|_|/ |/| | | |
| * | | | Merge branch 'stable-5.13' into stable-6.0Matthias Sohn2021-12-313-5/+62
| |\| | |
| | * | | Merge branch 'stable-5.12' into stable-5.13Matthias Sohn2021-12-313-5/+62
| | |\| |
| | | * | Merge branch 'stable-5.11' into stable-5.12Matthias Sohn2021-12-313-5/+62
| | | |\|
| | | | * Merge branch 'stable-5.10' into stable-5.11Matthias Sohn2021-12-313-5/+62
| | | | |\
| | | | | * Merge branch 'stable-5.9' into stable-5.10Matthias Sohn2021-12-313-5/+62
| | | | | |\
| | | | | | * Merge branch 'stable-5.8' into stable-5.9Matthias Sohn2021-12-303-5/+62
| | | | | | |\
| | | | | | | * Merge branch 'stable-5.7' into stable-5.8stable-5.8Matthias Sohn2021-12-303-5/+62
| | | | | | | |\
| | | | | | | | * Merge branch 'stable-5.6' into stable-5.7stable-5.7Matthias Sohn2021-12-303-5/+62
| | | | | | | | |\
| | | | | | | | | * Merge branch 'stable-5.5' into stable-5.6stable-5.6Matthias Sohn2021-12-303-5/+62
| | | | | | | | | |\
| | | | | | | | | | * Merge branch 'stable-5.4' into stable-5.5stable-5.5Matthias Sohn2021-12-303-5/+62
| | | | | | | | | | |\
| | | | | | | | | | | * Merge branch 'stable-5.3' into stable-5.4stable-5.4Matthias Sohn2021-12-303-5/+62
| | | | | | | | | | | |\
| | | | | | | | | | | | * Merge branch 'stable-5.2' into stable-5.3stable-5.3Matthias Sohn2021-12-303-5/+62
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * Merge branch 'stable-5.1' into stable-5.2stable-5.2Matthias Sohn2021-12-303-5/+62
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * Use FileSnapshot without using configs for FileBasedConfigstable-5.1Luca Milanesio2021-12-303-5/+62
* | | | | | | | | | | | | | | Merge branch 'stable-6.0'Thomas Wolf2021-12-264-14/+24
|\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'stable-5.13' into stable-6.0Thomas Wolf2021-12-264-14/+24
| |\| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge branch 'stable-5.12' into stable-5.13Thomas Wolf2021-12-262-13/+0
| | |\| | | | | | | | | | | |
| | | * | | | | | | | | | | | Merge branch 'stable-5.11' into stable-5.12Thomas Wolf2021-12-262-13/+0
| | | |\| | | | | | | | | | |
| | | | * | | | | | | | | | | Merge branch 'stable-5.10' into stable-5.11Thomas Wolf2021-12-262-13/+0
| | | | |\| | | | | | | | | |
| | | | | * | | | | | | | | | Merge branch 'stable-5.9' into stable-5.10Thomas Wolf2021-12-262-13/+0
| | | | | |\| | | | | | | | |
| | | | | | * | | | | | | | | Merge branch 'stable-5.8' into stable-5.9Thomas Wolf2021-12-262-13/+0
| | | | | | |\| | | | | | | |
| | | | | | | * | | | | | | | Merge branch 'stable-5.7' into stable-5.8Thomas Wolf2021-12-262-13/+0
| | | | | | | |\| | | | | | |
| | | | | | | | * | | | | | | Merge branch 'stable-5.6' into stable-5.7Thomas Wolf2021-12-262-13/+0
| | | | | | | | |\| | | | | |
| | | | | | | | | * | | | | | Merge branch 'stable-5.5' into stable-5.6Thomas Wolf2021-12-262-13/+0
| | | | | | | | | |\| | | | |
| | | | | | | | | | * | | | | Merge branch 'stable-5.4' into stable-5.5Thomas Wolf2021-12-262-13/+0
| | | | | | | | | | |\| | | |
| | | | | | | | | | | * | | | Merge branch 'stable-5.3' into stable-5.4Thomas Wolf2021-12-262-13/+0
| | | | | | | | | | | |\| | |
| | | | | | | | | | | | * | | Merge branch 'stable-5.2' into stable-5.3Thomas Wolf2021-12-262-13/+0
| | | | | | | | | | | | |\| |
| | | | | | | | | | | | | * | Merge branch 'stable-5.1' into stable-5.2Thomas Wolf2021-12-262-13/+0
| | | | | | | | | | | | | |\|
| | | | | | | | | | | | | | * Revert "RefDirectory.scanRef: Re-use file existence check done in snapshot cr...Thomas Wolf2021-12-262-13/+0
| | * | | | | | | | | | | | | TreeRevFilter: fix wrong stop when the given path disappearskylezhao2021-12-172-1/+24
* | | | | | | | | | | | | | | Merge "PackBitmapIndexV1: support parallel loading of reverse index"Ivan Frade2021-12-135-6/+106
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | PackBitmapIndexV1: support parallel loading of reverse indexAlina Djamankulova2021-12-065-6/+106
* | | | | | | | | | | | | | | | Add config reader for user-defined difftoolsAndre Bossert2021-12-0811-26/+672
* | | | | | | | | | | | | | | | Merge branch 'stable-6.0'Matthias Sohn2021-12-0417-16/+55
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'stable-5.13' into stable-6.0Matthias Sohn2021-12-0417-16/+55
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge branch 'stable-5.12' into stable-5.13Matthias Sohn2021-12-0430-29/+70
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / | | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | | Merge branch 'stable-5.11' into stable-5.12Matthias Sohn2021-12-0429-32/+73
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / | | | | |/| | | | | | | | | | |
| | | | * | | | | | | | | | | | Merge branch 'stable-5.10' into stable-5.11Matthias Sohn2021-12-0428-34/+75
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / | | | | | |/| | | | | | | | | |
| | | | | * | | | | | | | | | | Merge branch 'stable-5.9' into stable-5.10Matthias Sohn2021-12-0427-32/+73
| | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / / / / | | | | | | |/| | | | | | | | |
| | | | | | * | | | | | | | | | Merge branch 'stable-5.8' into stable-5.9Matthias Sohn2021-12-0426-31/+72
| | | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | |/ / / / / / / / | | | | | | | |/| | | | | | | |