* Merge branch 'stable-5.10' into stable-5.11

* Merge branch 'stable-5.6' into stable-5.7

* Add a cgit interoperability test for LockFile
* Add TemporaryBuffer.toString(int limit)

* Merge branch 'stable-5.4' into stable-5.5

* ResolveMerger: do not content-merge gitlinks on del/mod conflicts
* ResolveMerger: Adding test cases for GITLINK deletion
* ResolveMerger: choose OURS on gitlink when ignoreConflicts
* ResolveMerger: improving content merge readability
* ResolveMerger: extracting createGitLinksMergeResult method
* ResolveMerger: Adding test cases for GITLINK merge

* Merge branch 'stable-5.8'

* Merge branch 'stable-5.6' into stable-5.7

* Merge branch 'stable-5.6'

* Bazel: Fix warning about deprecated lib.bzl
* Format lib/BUILD with buildifier
* Bazel: Add fixes for --incompatible_load_java_rules_from_bzl
* Bazel: Bump minimum supported version to 0.29.0
* Bazel: Bump skylib library version to 0.8.0
* Use bazelisk to switch between used bazel version
* Bazel: Require minimum bazel version 0.17.1

* Merge branch 'stable-5.3' into stable-5.4

* FileSnapshot: fix bug with timestamp thresholding
* In LockFile#waitForStatChange wait in units of file time resolution
* Cache FileStoreAttributeCache per directory
* Fix FileSnapshot#save(long) and FileSnapshot#save(Instant)
* Persist minimal racy threshold and allow manual configuration
* Measure minimum racy interval to auto-configure FileSnapshot

* Fix error log message in ObjectDirectory.handlePackError()
* Properly format pack checksums in PackFile.idx()
* Cancel gc if thread was interrupted
* PackFile: report correct message for checksum mismatch
* ObjectDirectory: Clean up logging
* Bazel: Stop using native.git_repository
* ObjectDirectory: extra logging on packfile exceptions

* pgm: Fix missing braces in Push.run()
* pgm: Handle exceptions in Push command
* pgm: Fix missing braces in MergeBase.run()
* pgm: Handle IOException in MergeBase command
* pgm: Fix missing braces in Merge command
* pgm: Handle exceptions in Merge command
* pgm: Fix missing braces in LsTree.run()
* pgm: Handle exceptions in LsTree command
* pgm: Fix missing braces in LsRemote.run()
* pgm: Handle exceptions in LsRemote command
* pgm: Handle exceptions in LsFiles command
* pgm: Fix missing braces in Log.run()
* pgm: Handle exceptions in Log command
* pgm: Handle exceptions in Init command
* pgm: Handle IOException in IndexPack command
* pgm: Fix missing braces in Fetch.run()
* pgm: Handle IOException in Fetch command
* pgm: Handle GitAPIException in Gc command
* pgm: Fix missing braces in DiffTree.run()
* pgm: Handle exceptions in DiffTree command

* Remove unnecessary @since tags from non-API classes

* RepoCommand: Preserve executable bit in <copyfile>
* RepoCommand.RemoteReader: Add method to read contents and mode of file
* RepoCommandTest: Extract method to assert file contents

* Merge branch 'stable-4.11' into stable-5.0

* Fix IOException when LockToken#close fails

* UploadPack: avoid conflating shallow commit lists in protocol v2

* Configure WindowCache settings to use in JGit CLI

* ReceivePack: clear advertised .haves if application changes refs

* dfs: only create DfsPackFile if description has PACK

* StreamCopyThread: Do not let flush interrupt a write

* Enhance RepositoryTestCase.commitFile() to work on empty repository

* Enable writing bitmaps during GC by default.
* Enable writing pack indexes with bitmaps in the GC.
* Enable serving upload requests using bitmaps.
* Support creating pack bitmap indexes in PackWriter.
* Added read/write support for pack bitmap index.

* Mark fields of BaseReceivePack private
* Delete checkObjectCollisions from PackParser

* Fix order of deletion for files/dirs in ResolveMerger
* Don't return success on failing paths in ResolveMerger

* Remove TODO for generated constructor.