Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-03-11 02:32:43 +0300
committerJunio C Hamano <gitster@pobox.com>2010-03-11 02:32:43 +0300
commit90a2bf9ca155c8e0e43d9e30197d9562dd02ea96 (patch)
tree5c6b98713a4724ef44054b5fe513d260157e3bd4 /Documentation/config.txt
parentc505a850157961d2db4512d029753946d0591649 (diff)
parent160ad147fe9f644fc35224095e1d1a01be0208de (diff)
Merge branch 'sd/init-template'
* sd/init-template: wrap-for-bin: do not export an empty GIT_TEMPLATE_DIR t/t0001-init.sh: add test for 'init with init.templatedir set' init: having keywords without value is not a global error. Add a "TEMPLATE DIRECTORY" section to git-init[1]. Add `init.templatedir` configuration variable.
Diffstat (limited to 'Documentation/config.txt')
-rw-r--r--Documentation/config.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 87a3512073..c80262bc37 100644
--- 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].