summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Jonathan Tan <jonathantanmy@google.com>2017-05-08 14:33:50 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-05-09 12:11:44 +0900
commitb7b744f297b736c51636407f5883b3777bb36433 (patch)
treeff33911235b81e595a853d31f281affe4845817e
parentPrepare for 2.12.3 (diff)
downloadtgif-b7b744f297b736c51636407f5883b3777bb36433.tar.xz
docs: correct receive.advertisePushOptions default
In commit c714e45 ("receive-pack: implement advertising and receiving push options", 2016-07-14), receive-pack was taught to (among other things) advertise that it understood push options, depending on configuration. It was documented that it advertised such ability by default; however, it actually does not. (In that commit, notice that advertise_push_options defaults to 0, unlike advertise_atomic_push which defaults to 1.) Update the documentation to state that it does not advertise the ability by default. Signed-off-by: Jonathan Tan <jonathantanmy@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/config.txt5
1 files changed, 2 insertions, 3 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index e43d147825..5eb326ed21 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -2537,9 +2537,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