Document new "already-merged" rule for branch -d

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 7103172ed30c33f2c7933f530d03ce98c1e4f360..75b8afec09aa490f707d2b7abcc40e96f416bfac 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -885,7 +885,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
@@ -1442,7 +1442,7 @@ receive.denyCurrentBranch::
        out of sync with the index and working tree. If set to "warn",
        print a warning of such a push to stderr, but allow the push to
        proceed. If set to false or "ignore", allow such pushes with no
-       message. Defaults to "warn".
+       message. Defaults to "refuse".
 
 receive.denyNonFastForwards::
        If set to true, git-receive-pack will deny a ref update which is