Merge branch 'jt/push-options-doc' into maint

The receive-pack program now makes sure that the push certificate
records the same set of push options used for pushing.

* jt/push-options-doc:
  receive-pack: verify push options in cert
  docs: correct receive.advertisePushOptions default

diff --cc Documentation/config.txt
Simple merge

diff --cc Documentation/technical/pack-protocol.txt
Simple merge

diff --cc builtin/receive-pack.c
Simple merge