Merge branch 'jh/notes'

[git.git] / Documentation / config.txt

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 87a3512073c6c7fbb48679f5a6a0d639a1d857ef..c80262bc37065bc2f7fe16427df0940840614e45 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].