Merge branch 'bw/protocol-v2' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 21 Nov 2018 13:57:57 +0000 (22:57 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 21 Nov 2018 13:57:57 +0000 (22:57 +0900)
Doc fix.

* bw/protocol-v2:
  config: document value 2 for protocol.version

1  2 
Documentation/config.txt

Simple merge