Merge branch 'cc/reset-keep'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 87a3512073c6c7fbb48679f5a6a0d639a1d857ef..805e0511ff06919f540b57432b6940689d2d5abc 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1210,6 +1210,10 @@ imap::
        The configuration variables in the 'imap' section are described
        in linkgit:git-imap-send[1].
 
+init.templatedir::
+       Specify the directory from which templates will be copied.
+       (See the "TEMPLATE DIRECTORY" section of linkgit:git-init[1].)
+
 instaweb.browser::
        Specify the program that will be used to browse your working
        repository in gitweb. See linkgit:git-instaweb[1].
@@ -1449,7 +1453,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