Merge branch 'jt/push-options-doc' into maint
commit058d655f8fa68986d1d4a020052728e9e6fa848c
authorJunio C Hamano <gitster@pobox.com>
Sun, 4 Jun 2017 01:21:05 +0000 (4 10:21 +0900)
committerJunio C Hamano <gitster@pobox.com>
Sun, 4 Jun 2017 01:21:05 +0000 (4 10:21 +0900)
treed5dda906c8e8cb8564fdfd4adc278f41153b284f
parent34bbe2edd47cf22a7af361f8ec9d41c5ec95aaac
parentcbaf82cc6b734244a9190c3341ca5f08f8d5acc4
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
Documentation/config.txt
Documentation/technical/pack-protocol.txt
builtin/receive-pack.c