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

* Make Javadoc consistent for PackStatistics fields

* Merge branch 'stable-5.6'

* JGit pgm: Format blame output to match canonical git
* Make blame work correctly on merge conflicts

* 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

* Constants for objects and info/{http-,}alternates

* Upgrade spotbugs to 3.1.11

* Merge branch 'stable-4.9' into stable-4.10

* AutoCRLFInputStreamTest: Open auto-closeable resources in try-with-resource
* CleanCommandTest: Open Repository in try-with-resource
* CGitVsJGitRandomIgnorePatternTest: Open OutputStream in try-with-resource
* ArchiveTest: Open auto-closeable resources in try-with-resource
* ArchiveCommand: Create archive output stream in try-with-resource
* ApplyCommand: Open FileWriter in try-with-resource

* Add class to access WindowCache statistics

* LfsProtocolServlet: Improve error on getLargeFileRepository failure

* LfsProtocolServlet: Always set the Content-Type header on response
* LfsProtocolServlet: Don't set pretty printing on Gson

* Revert "Fix warnings about unchecked conversion of MergeResult"

* PushCertificateParser: Move reader parsing to instance method
* PushCertificateParser: Make constructor public
* Report PackProtocolExceptions to client during receive-pack
* PushCertificate: implement hashCode/equals/toString
* PushCertificateParser: Make pushee optional
* PushCertificateParser: Change error string for invalid field
* PushCertificateParser: Add method for parsing from a stream
* IO: Add a method for reading lines
* BaseReceivePack: Treat all LFs as optional
* BaseReceivePack: More validation during parseCommand

* Revert "CommitBuilder should check for duplicate parents"

* Fix DirCacheCheckout to set correct file length if core.autocrlf=true

* BundleWriter: Support including HEAD in bundle

* Files should be deleted with "retry" option

* Do not allow non-ff-rebase if there are uncommitted changes

* Detect and handle a checkout conflict during merge nicely

* Simplify size test in PackWriter
* Declare critical exposed methods of ObjectToPack final
* Declare internal flag accessors of ObjectToPack final
* Remove unused method isDeltaAttempted()
* Simplify setDoNotDelta() to always set the flag

* Fix UnionInputStream.read to be more Java-like

* Use working tree iterator to compare file modes

* Enable loading history until a given commit