aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'stable-5.3'Matthias Sohn2019-03-070-0/+0
|\
| * Prepare 5.3.0-SNAPSHOT buildsMatthias Sohn2019-03-0668-89/+89
| * JGit v5.3.0.201903061415-rc1v5.3.0.201903061415-rc1Matthias Sohn2019-03-0668-89/+89
| * Merge branch 'master' into stable-5.3Matthias Sohn2019-03-06126-1707/+2825
| |\
| * \ Merge branch 'stable-5.2' into stable-5.3Matthias Sohn2019-03-066-12/+71
| |\ \
| | * \ Merge branch 'stable-5.1' into stable-5.2David Pursehouse2019-03-060-0/+0
| | |\ \
| | | * \ Merge branch 'stable-5.0' into stable-5.1David Pursehouse2019-03-060-0/+0
| | | |\ \
| | | | * \ Merge branch 'stable-4.11' into stable-5.0David Pursehouse2019-03-067-11/+74
| | | | |\ \
| | | | | * \ Merge branch 'stable-4.10' into stable-4.11David Pursehouse2019-03-067-11/+74
| | | | | |\ \
| | | | | | * \ Merge branch 'stable-4.9' into stable-4.10David Pursehouse2019-03-067-11/+74
| | | | | | |\ \
| | | | | | | * | Fix error log message in ObjectDirectory.handlePackError()Matthias Sohn2019-03-062-3/+3
| | | | | | | * | Properly format pack checksums in PackFile.idx()Matthias Sohn2019-03-061-2/+3
| | | | | | | * | Cancel gc if thread was interruptedMatthias Sohn2019-03-062-1/+53
| | | | | | | * | PackFile: report correct message for checksum mismatchLuca Milanesio2019-03-062-6/+7
| | | | | | | * | ObjectDirectory: Clean up loggingDavid Pursehouse2019-03-063-2/+7
| | | | | | | * | Bazel: Stop using native.git_repositoryDavid Pursehouse2019-03-061-1/+3
| | | | | | | * | ObjectDirectory: extra logging on packfile exceptionsLuca Milanesio2019-03-061-0/+2
* | | | | | | | | Track object inflation time in DfsReaderIoStatsTerry Parker2019-03-062-0/+14
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Update Orbit to R20190226160451Matthias Sohn2019-03-0613-27/+24
* | | | | | | | Merge "Upgrade maven-javadoc-plugin to 3.1.0"Matthias Sohn2019-03-051-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Upgrade maven-javadoc-plugin to 3.1.0David Pursehouse2019-03-051-1/+1
* | | | | | | | | Merge "Merge branch 'stable-5.2'"Matthias Sohn2019-03-056-12/+71
|\| | | | | | | |
| * | | | | | | | Merge branch 'stable-5.2'David Pursehouse2019-03-056-12/+71
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Merge branch 'stable-5.1' into stable-5.2David Pursehouse2019-03-056-12/+71
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | Fix error log message in ObjectDirectory.handlePackError()Matthias Sohn2019-03-042-3/+3
| | | * | | | | | Properly format pack checksums in PackFile.idx()Matthias Sohn2019-03-041-2/+3
| | | * | | | | | Cancel gc if thread was interruptedMatthias Sohn2019-03-032-1/+53
| | | * | | | | | PackFile: report correct message for checksum mismatchLuca Milanesio2019-03-032-6/+7
| | | * | | | | | ObjectDirectory: Clean up loggingDavid Pursehouse2019-03-033-2/+7
| | | * | | | | | Bazel: Stop using native.git_repositoryDavid Pursehouse2019-03-031-1/+3
* | | | | | | | | Merge "diff: add option metaVar for --src-prefix and --dst-prefix"Christian Halstrick2019-03-052-2/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | diff: add option metaVar for --src-prefix and --dst-prefixAndre Bossert2019-03-042-2/+3
* | | | | | | | | ResolveMerger: Destroy TemporaryBuffer on unchecked exceptionsDave Borowitz2019-03-011-3/+6
* | | | | | | | | Expose the filter blob limit in UploadPackTerry Parker2019-02-281-0/+14
* | | | | | | | | Upgrade error_prone_core to 2.3.3David Pursehouse2019-02-271-1/+1
* | | | | | | | | Merge changes from topic 'rebase_compatibility'Thomas Wolf2019-02-261-4/+25
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | RebaseCommand: tighten check for --preserve-merges on --continueThomas Wolf2019-02-261-1/+5
| * | | | | | | | | RebaseCommand: use orig-head to abortThomas Wolf2019-02-261-2/+15
| * | | | | | | | | RebaseCommand: use orig-head in addition to headThomas Wolf2019-02-261-1/+5
* | | | | | | | | | Merge "Strongly reference indices in DfsPackFile"Jonathan Nieder2019-02-261-128/+113
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Strongly reference indices in DfsPackFileMinh Thai2019-02-211-128/+113
* | | | | | | | | | | Merge "On Windows use %APPDATA%\gnupg as GPG directory if it exists"Gunnar Wagenknecht2019-02-261-6/+39
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | On Windows use %APPDATA%\gnupg as GPG directory if it existsThomas Wolf2019-02-261-6/+39
* | | | | | | | | | | | Merge "Remove duplicate externalized message"Christian Halstrick2019-02-263-4/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Remove duplicate externalized messageThomas Wolf2019-02-263-4/+2
| |/ / / / / / / / / /
* | | | | | | | | | | RebaseCommand: fix ONTO_NAME, and --preserve-merges is interactiveThomas Wolf2019-02-261-6/+26
* | | | | | | | | | | Fix core.autocrlf for non-normalized indexThomas Wolf2019-02-267-11/+282
|/ / / / / / / / / /
* | | | | | | | | | SHA1: Use externalized message in logDavid Pursehouse2019-02-251-1/+4
* | | | | | | | | | JGitText: Remove unnecessary suffix from externalized message identifierDavid Pursehouse2019-02-253-3/+3
* | | | | | | | | | FS_POSIX: Externalize log messageDavid Pursehouse2019-02-253-2/+5
|/ / / / / / / / /