Merge branch 'jt/push-options-doc'
commit3c980083bc404cb62fb87c76d331c48a44c5f50d
authorJunio C Hamano <gitster@pobox.com>
Tue, 23 May 2017 04:46:07 +0000 (23 13:46 +0900)
committerJunio C Hamano <gitster@pobox.com>
Tue, 23 May 2017 04:46:07 +0000 (23 13:46 +0900)
tree7f2fe624f1737885de03efc891363401341bcf39
parente4b6ccdbffc6b4aa17af511632e7228f900a673e
parentcbaf82cc6b734244a9190c3341ca5f08f8d5acc4
Merge branch 'jt/push-options-doc'

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
Documentation/config.txt
Documentation/technical/pack-protocol.txt
builtin/receive-pack.c