From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 4 Jun 2017 01:21:05 +0000 (+0900)
Subject: Merge branch 'jt/push-options-doc' into maint
X-Git-Tag: v2.13.1~26
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/058d655f8fa68986d1d4a020052728e9e6fa848c

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
---

058d655f8fa68986d1d4a020052728e9e6fa848c