Merge branch 'maint' to sync with 1.5.2.5

[git.git] / Documentation / config.txt

diff --git a/Documentation/config.txt b/Documentation/config.txt
index dd98d95d9748cdcb4fd0926a049b4a68dad47a73..de9e72b562eec6310af23cb4e5ef237268e8df2a 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -101,7 +101,7 @@ Example
 
        # Proxy settings
        [core]
-               gitProxy="ssh" for "ssh://kernel.org/"
+               gitProxy="ssh" for "kernel.org"
                gitProxy=default-proxy ; for the rest
 
 Variables
@@ -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'.