Merge branch 'sb/atomic-push'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 04e2a71687922bbf78a493df6ca6dc5730359eb1..1a54eae8f82da26f8b9190d2ce5530bacf09f771 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -2094,6 +2094,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