aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge changes from topic "fix_ui"Terry Parker2020-09-033-49/+459
|\
| * ResolveMerger: do not content-merge gitlinks on del/mod conflictsDemetr Starshov2020-08-262-37/+44
| * ResolveMerger: Adding test cases for GITLINK deletionDemetr Starshov2020-08-261-0/+91
| * ResolveMerger: choose OURS on gitlink when ignoreConflictsDemetr Starshov2020-08-262-14/+11
| * ResolveMerger: improving content merge readabilityDemetr Starshov2020-08-261-12/+14
| * ResolveMerger: extracting createGitLinksMergeResult methodDemetr Starshov2020-08-261-8/+14
| * ResolveMerger: Adding test cases for GITLINK mergeDemetr Starshov2020-08-262-0/+307
* | Merge branch 'stable-5.9'Marco Miller2020-09-0234-123/+235
|\ \
| * \ Merge changes Ib0b2dc7c,I827da397 into stable-5.9Matthias Sohn2020-09-022-3/+3
| |\ \
| | * | Upgrade maven-resources-plugin to 3.2.0Marco Miller2020-09-012-2/+2
| | * | Upgrade plexus-compiler version to 2.8.8Marco Miller2020-09-011-1/+1
| * | | [bazel] Add missing dependency to slf4j-apiMatthias Sohn2020-09-012-0/+2
| * | | [errorprone] DirCacheEntry: make clear operator precedenceMatthias Sohn2020-09-011-1/+1
| * | | [errorprone] PackWriter#parallelDeltaSearch: avoid suppressed exceptionMatthias Sohn2020-09-011-1/+9
| * | | [errorprone] Declare DirCache#version finalMatthias Sohn2020-09-011-1/+1
| |/ /
| * | Add jgit-4.17-staging target platform for 2020-09Matthias Sohn2020-09-012-0/+102
| * | Update target platform to R20200831200620Matthias Sohn2020-09-0125-117/+117
* | | Prepare 5.10.0-SNAPSHOT buildsMatthias Sohn2020-08-2788-504/+504
* | | Merge branch 'stable-5.9' into masterMatthias Sohn2020-08-270-0/+0
|\| |
| * | Prepare 5.9.0-SNAPSHOT buildsMatthias Sohn2020-08-2788-121/+121
| * | JGit v5.9.0.202008260805-m3v5.9.0.202008260805-m3Matthias Sohn2020-08-2688-121/+121
|/ /
* | Fix possible NegativeArraySizeException in PackIndexV1Marc Strapetz2020-08-256-3/+35
* | FS: use binary search to determine filesystem timestamp resolutionThomas Wolf2020-08-233-13/+127
* | Do not prematurely create directory of jgit's XDG config fileMatthias Sohn2020-08-223-20/+8
* | FS: write to JGit config in a background threadThomas Wolf2020-08-211-4/+29
* | FS: don't cache fallback if running in backgroundThomas Wolf2020-08-201-2/+10
* | Keep line endings for text files committed with CR/LF on text=autoThomas Wolf2020-08-178-183/+448
* | Delay WindowCache statistics JMX MBean registrationThomas Wolf2020-08-161-7/+15
* | [releng] Update plexus-compiler to 2.8.7Thomas Wolf2020-08-151-3/+4
* | DirCache: support index V4Thomas Wolf2020-08-159-62/+552
* | Update javadoc for RemoteSession and SshSessionFactoryThomas Wolf2020-08-103-67/+52
* | Fix JSchProcess.waitFor() with time-outThomas Wolf2020-08-106-14/+161
* | sshd: work around a race condition in Apache MINA sshd 2.4.0/2.5.xThomas Wolf2020-08-104-6/+149
* | sshd: store per-session data on the sshd session objectThomas Wolf2020-08-095-95/+225
* | Merge changes from topic "sshd"Thomas Wolf2020-08-056-64/+125
|\ \ | |/ |/|
| * sshd: use PropertyResolver in testThomas Wolf2020-07-282-8/+9
| * Remove dependency on JSch from SSH test frameworkThomas Wolf2020-07-265-56/+116
* | FilterSpec: Use BigInteger.ZERO instead of valueOf(0)Jonathan Nieder2020-07-311-1/+2
* | Do not send empty blob in response to blob:none filterJonathan Nieder2020-07-295-16/+115
* | Add support for tree filters when fetchingJonathan Nieder2020-07-292-8/+44
* | FS_POSIX: avoid prompt to install the XCode tools on OS XThomas Wolf2020-07-262-9/+34
* | Use LinkedBlockingQueue for executor determining filesystem attributesMatthias Sohn2020-07-241-2/+2
|/
* Bazel: Add workspace status command to stamp final artifactDavid Ostrovsky2020-07-173-1/+68
* DiffFormatter: correctly deal with tracked files in ignored foldersThomas Wolf2020-07-174-8/+92
* Merge branch 'stable-5.8'Matthias Sohn2020-07-150-0/+0
|\
| * Prepare 5.8.2-SNAPSHOT buildsMatthias Sohn2020-07-1488-503/+503
| * JGit v5.8.1.202007141445-rv5.8.1.202007141445-rMatthias Sohn2020-07-1488-121/+121
* | Update Jetty to 9.4.30.v20200611Matthias Sohn2020-07-1413-211/+211
* | Fix writing GPG signatures with trailing newlineThomas Wolf2020-07-082-45/+65
* | Rename a test methodThomas Wolf2020-07-041-1/+1
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-24 16:35:25 +0000