Add it to the list in config.txt and explicitly say that the --template option to git-commit overrides the configuration variable. --- d1cc130a5eb50d5bfe1e8b76cab3d8970fd70ad1 added a config var, but didn't add it to the full list. Documentation/config.txt | 3 +++ Documentation/git-commit.txt | 5 ++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index dd98d95..3135cb7 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -393,6 +393,9 @@ color.status.<slot>:: or `untracked` (files which are not tracked by git). The values of these variables may be specified as in color.branch.<slot>. +commit.template:: + Specify a file to use as the template for new commit messages. + diff.renameLimit:: The number of files to consider when performing the copy/rename detection; equivalent to the git diff option '-l'. diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt index 3f36c67..627994e 100644 --- a/Documentation/git-commit.txt +++ b/Documentation/git-commit.txt @@ -78,9 +78,8 @@ OPTIONS Use the contents of the given file as the initial version of the commit message. The editor is invoked and you can make subsequent changes. If a message is specified using - the `-m` or `-F` options, this option has no effect. The - template file may also be specified using the `commit.template` - configuration variable. + the `-m` or `-F` options, this option has no effect. This + overrides the `commit.template` configuration variable. -s|--signoff:: Add Signed-off-by line at the end of the commit message. -- 1.5.3.rc2.38.g11308 - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
