Merge branch 'ab/fetch-nego'
commit28dbabb5e04d0d2bc714c46f24dfbf102089c15b
authorJunio C Hamano <gitster@pobox.com>
Fri, 17 Aug 2018 20:09:55 +0000 (17 13:09 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 17 Aug 2018 20:09:55 +0000 (17 13:09 -0700)
tree8aeebb44d9d14177a512e7b73532bb00865c3362
parent72c11b7e62c02d18a51f0bbaa2154ecebf8c74f0
parent526608284a7600c5f0bcd6f5435ee680d79347ef
Merge branch 'ab/fetch-nego'

Update to a few other topics around 'git fetch'.

* ab/fetch-nego:
  fetch doc: cross-link two new negotiation options
  negotiator: unknown fetch.negotiationAlgorithm should error out
Documentation/config.txt