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

* Remove texts which were added by mistake in 00386272
* Fix formatting which was broken in 00386272

* Merge branch 'stable-5.12'

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

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

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

* Merge branch 'stable-5.8' into stable-5.9

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

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

* LockFile: create OutputStream only when needed

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

* LockFile: create OutputStream only when needed

* Merge branch 'stable-5.12'

* Prepare 5.12.0-SNAPSHOT builds

* JGit v5.12.0.202105051250-m2

* [releng] Update eclipse-jarsigner-plugin to 1.3.1

* Update jetty to 9.4.40.v20210413

* Implement ours/theirs content conflict resolution

* ssh: ensure list is modifiable before using Iterator.remove().

* Update orbit to S20210406213021 and add 4.20-staging target

* Fix typo in test method name

* Upgrade ecj to 3.25.0

* Allow file mode conflicts in virtual base commit on recursive merge.

* sshd: don't lock the known_hosts files on reading
* Allow info messages in UsernamePasswordCredentialsProvider
* ssh config: do environment variable replacement
* sshd: implement server-sig-algs SSH extension (client side)

* Bazel: Remove unused dependencies flagged by unused_deps
* Bazel: Format build file with buildifier

* Upgrade wagon-ssh to 3.4.3
* Update spring-boot-maven-plugin to 2.4.4
* Update spotbugs-maven-plugin to 4.2.2
* Update japicmp-maven-plugin to 0.15.3

* Merge branch 'stable-5.11'

* Refactor CommitCommand to improve readability
* CommitCommand: fix formatting
* CommitCommand: remove unncessary comment
* Ensure post-commit hook is called after index lock was released

* sshd: try all configured signature algorithms for a key
* sshd: modernize ssh config file parsing
* sshd: implement ssh config PubkeyAcceptedAlgorithms

* Enable CommitCommand to use a fluent style

* Merge branch 'master' into next

* Optimize RevWalkUtils.findBranchesReachableFrom()

* Introduce getMergedInto(RevCommit commit, Collection<Ref> refs)

* Skip detecting content renames for large files

* Remove unused API problem filters

* Document http options supported by JGit

* HTTP cookies: do tilde expansion on http.cookieFile

* Prepare 5.12.0-SNAPSHOT builds
* Merge branch 'stable-5.11'

* Update Orbit to R20210223232630

* Prepare 5.11.1-SNAPSHOT builds

* JGit v5.11.0.202103091610-r

* Merge branch 'master' into stable-5.11

* Manually set status of jmh dependencies
* Update DEPENDENCIES report for 5.11.0

* Add dependency to dash-licenses

* PackFile: Add id + ext based constructors
* GC: deleteOrphans: Use PackFile

* PackExt: Convert to Enum
* Restore preserved packs during missing object seeks

* Pack: Replace extensions bitset with bitmapIdx PackFile
* PackDirectory: Use PackFile to ensure we find preserved packs

* GC: Use PackFile to de-dup logic
* Create a PackFile class for Pack filenames

* Prepare 5.11.0-SNAPSHOT builds

* JGit v5.11.0.202103031150-rc1