* Support "http.userAgent" and "http.extraHeader" from the git config

* 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.6'

* reftable: fix lookup by ID in merged reftables

* Error Prone: Increase severity of NonOverridingEquals to ERROR
* Error Prone: Increase severity of ImmutableEnumChecker to ERROR
* GitDateParser#ParseableSimpleDateFormat: Make formatStr private final
* BatchRefUpdateTest: Suppress ImmutableEnumChecker warning
* PacketLineIn: Suppress comparison warnings for END and DELIM
* FileSnapshot#toString: Suppress ReferenceEquality warnings
* Blame: Suppress ReferenceEquality warning for RevCommit instances

* Prepare 4.7.10-SNAPSHOT builds

* UploadPackTest: Avoid unnecessarily boxing int into Integer

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

* Remove deprecated TreeWalk#getEolStreamType
* Remove deprecated FileTreeIterator(WorkingTreeIterator, File, FS)
* Remove deprecated TransportHttp#httpOpen(String, URL)
* Remove deprecated ResolveMerger#processEntry method
* Remove deprecated Repository#getRef
* Remove deprecated BitmapBuilder#add

* Prepare 5.0.0-SNAPSHOT builds
* Merge branch 'stable-4.11'

* Skip unborn branches in UploadPack

* Honor trustFolderStats also when reading packed-refs

* Add tests for updating single refs to missing objects
* Fix deleting symrefs
* RefDirectory: Throw exception if CAS of packed ref list fails
* ReceiveCommand: Explicitly check constructor preconditions
* BatchRefUpdate: Document when getPushOptions is null

* Merge branch 'stable-4.7'

* IndexModificationTimesTest: Open Git instances in try-with-resource

* Add setTargetBranch in RepoCommand.

* Remove unnecessary $NON-NLS comment in BaseReceivePack
* Use try-with-resources to close resources in BaseReceivePack

* Merge branch 'stable-3.7'

* DirCache.findEntry(byte[], in) made public

* Rescale "Compressing objects" progress meter by size
* Split delta search buckets by byte weight

* Fix while boundries in DateRevQueue.add()

* Add conflicts message before footer
* Only replace the ChangeId in the footer, not in the body