summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-05-23 04:46:07 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-05-23 04:46:07 (GMT)
commit3c980083bc404cb62fb87c76d331c48a44c5f50d (patch)
tree7f2fe624f1737885de03efc891363401341bcf39 /Documentation/config.txt
parente4b6ccdbffc6b4aa17af511632e7228f900a673e (diff)
parentcbaf82cc6b734244a9190c3341ca5f08f8d5acc4 (diff)
downloadgit-3c980083bc404cb62fb87c76d331c48a44c5f50d.zip
git-3c980083bc404cb62fb87c76d331c48a44c5f50d.tar.gz
git-3c980083bc404cb62fb87c76d331c48a44c5f50d.tar.bz2
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
Diffstat (limited to 'Documentation/config.txt')
-rw-r--r--Documentation/config.txt5
1 files changed, 2 insertions, 3 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 96e9cf8..e0b9fd0 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -2623,9 +2623,8 @@ receive.advertiseAtomic::
capability, set this variable to false.
receive.advertisePushOptions::
- By default, git-receive-pack will advertise the push options
- capability to its clients. If you don't want to advertise this
- capability, set this variable to false.
+ When set to true, git-receive-pack will advertise the push options
+ capability to its clients. False by default.
receive.autogc::
By default, git-receive-pack will run "git-gc --auto" after