Document commit.template configuration variable.

[git.git] / Documentation / config.txt

diff --git a/Documentation/config.txt b/Documentation/config.txt
index a850d55bf68d3e64486f38bad1adb3fc1b97a81a..3135cb7a66814a5764891641f300be07681c551e 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -286,8 +286,8 @@ core.editor::
        messages by lauching an editor uses the value of this
        variable when it is set, and the environment variable
        `GIT_EDITOR` is not set.  The order of preference is
-       `GIT_EDITOR` environment, `core.editor`, `EDITOR` and
-       `VISUAL` environment variables and then finally `vi`.
+       `GIT_EDITOR` environment, `core.editor`, `VISUAL` and
+       `EDITOR` environment variables and then finally `vi`.
 
 core.pager::
        The command that git will use to paginate output.  Can be overridden
@@ -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'.