summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Beller <sbeller@google.com>2015-01-12 16:24:02 -0800
committerJunio C Hamano <gitster@pobox.com>2015-01-14 12:07:21 -0800
commit04b39f195baf95b79c9c28a096011e9fe0a08303 (patch)
treebde1a7f8079061f3f10d0527bd5e69d1d00530c8
parentad35ecabea5e687a777478a8900716a0ea74247f (diff)
downloadgit-04b39f195baf95b79c9c28a096011e9fe0a08303.tar.gz
Document receive.advertiseatomic
This was missing in 1b70fe5d3054 (2015-01-07, receive-pack.c: negotiate atomic push support) as I squashed the option in very late in the patch series. Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/config.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 922072596f..4f8f4989fe 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -2072,6 +2072,11 @@ rebase.autostash::
successful rebase might result in non-trivial conflicts.
Defaults to false.
+receive.advertiseatomic::
+ By default, git-receive-pack will advertise the atomic push
+ capability to its clients. If you don't want to this capability
+ to be advertised, set this variable to false.
+
receive.autogc::
By default, git-receive-pack will run "git-gc --auto" after
receiving data from git-push and updating refs. You can stop