Merge branch 'maint'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 06b2f827b414651bde25165b4f42dc4160892d7a..aa5411e455dd935c54ae1bb66d0b64f976461937 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -914,7 +914,7 @@ format.signoff::
 gc.aggressiveWindow::
        The window size parameter used in the delta compression
        algorithm used by 'git gc --aggressive'.  This defaults
-       to 10.
+       to 250.
 
 gc.auto::
        When there are approximately more than this many loose