{"thread":{"id":"22193","subject":"[PATCH 2/2] Add a \"TEMPLATE DIRECTORY\" section to git-init[1].","startedAt":"2010-01-13T04:19:45Z","lastAt":"2010-01-13T04:19:45Z","messageCount":1,"participants":["Steven Drake"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"131418","messageId":"alpine.LNX.2.00.1001131719390.22639@vqena.qenxr.bet.am","threadId":"22193","inReplyTo":"04b754c8823368ec1459c16f4aa8890cc0de0204.1263356312.git.sdrake@xnet.co.nz","subject":"[PATCH 2/2] Add a \"TEMPLATE DIRECTORY\" section to git-init[1].","fromName":"Steven Drake","fromEmail":"sdrake@xnet.co.nz","sentAt":"2010-01-13T04:19:45Z","receivedAt":"2010-01-13T04:19:45Z","isPatch":true,"sender":{"key":"sdrake@xnet.co.nz","avatar":null},"body":"Add references to it in config.txt and git-clone[1].\n\nSigned-off-by: Steven Drake <sdrake@xnet.co.nz>\n---\n Documentation/config.txt    |    4 ++++\n Documentation/git-clone.txt |    3 +--\n Documentation/git-init.txt  |   29 +++++++++++++++++++++--------\n 3 files changed, 26 insertions(+), 10 deletions(-)\n\ndiff --git a/Documentation/config.txt b/Documentation/config.txt\nindex dd261cf..b0369c4 100644\n--- a/Documentation/config.txt\n+++ b/Documentation/config.txt\n@@ -1178,6 +1178,10 @@ imap::\n \tThe configuration variables in the 'imap' section are described\n \tin linkgit:git-imap-send[1].\n \n+init-db.templatedir::\n+\tSpecify the directory from which templates will be copied.\n+\t(See the \"TEMPLATE DIRECTORY\" section of linkgit:git-init[1].)\n+\n instaweb.browser::\n \tSpecify the program that will be used to browse your working\n \trepository in gitweb. See linkgit:git-instaweb[1].\ndiff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt\nindex 7ccd742..731b57e 100644\n--- a/Documentation/git-clone.txt\n+++ b/Documentation/git-clone.txt\n@@ -143,8 +143,7 @@ objects from the source repository into a pack in the cloned repository.\n \n --template=<template_directory>::\n \tSpecify the directory from which templates will be used;\n-\tif unset the templates are taken from the installation\n-\tdefined default, typically `/usr/share/git-core/templates`.\n+\t(See the \"TEMPLATE DIRECTORY\" section of linkgit:git-init[1].)\n \n --depth <depth>::\n \tCreate a 'shallow' clone with a history truncated to the\ndiff --git a/Documentation/git-init.txt b/Documentation/git-init.txt\nindex f081b24..86b5766 100644\n--- a/Documentation/git-init.txt\n+++ b/Documentation/git-init.txt\n@@ -28,14 +28,8 @@ current working directory.\n \n --template=<template_directory>::\n \n-Provide the directory from which templates will be used.  The default template\n-directory is `/usr/share/git-core/templates`.\n-\n-When specified, `<template_directory>` is used as the source of the template\n-files rather than the default.  The template files include some directory\n-structure, some suggested \"exclude patterns\", and copies of non-executing\n-\"hook\" files.  The suggested patterns and hook files are all modifiable and\n-extensible.\n+Specify the directory from which templates will be used.  (See the \"TEMPLATE\n+DIRECTORY\" section below.)\n \n --shared[={false|true|umask|group|all|world|everybody|0xxx}]::\n \n@@ -106,6 +100,25 @@ of the repository, such as installing the default hooks and\n setting the configuration variables.  The old name is retained\n for backward compatibility reasons.\n \n+TEMPLATE DIRECTORY\n+------------------\n+\n+The template directory contains files and directories that will be copied to\n+the `$GIT_DIR` after it is created.\n+\n+The template directory used will (in order of preference):\n+\n+ - The argument given with the `--template` option.\n+\n+ - The contents of the `$GIT_TEMPLATE_DIR` environment variable.\n+\n+ - The `init-db.templatedir` configuration variable.\n+\n+ - The default template directory: `/usr/share/git-core/templates`.\n+\n+The default template directory includes some directory structure, some\n+suggested \"exclude patterns\", and copies of non-executing \"hook\" files.\n+The suggested patterns and hook files are all modifiable and extensible.\n \n EXAMPLES\n --------\n-- \n1.6.4\n"}]}