Expand ~ and ~user in core.excludesfile, commit.template

diff --git a/Documentation/config.txt b/Documentation/config.txt
index be0b8cacaa17234a2f2d3da50b63df7ff272d468..958006ca7673d0c3158fc3f8b16dcebbf11dd9eb 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -380,7 +380,8 @@ Common unit suffixes of 'k', 'm', or 'g' are supported.
 core.excludesfile::
        In addition to '.gitignore' (per-directory) and
        '.git/info/exclude', git looks into this file for patterns
-       of files which are not meant to be tracked.  See
+       of files which are not meant to be tracked.  "~/" and "~user/"
+       are expanded to the specified user's home directory.  See
        linkgit:gitignore[5].
 
 core.editor::
@@ -539,7 +540,7 @@ branch.<name>.merge::
 
 branch.<name>.mergeoptions::
        Sets default options for merging into branch <name>. The syntax and
-       supported options are equal to that of linkgit:git-merge[1], but
+       supported options are the same as those of linkgit:git-merge[1], but
        option values containing whitespace characters are currently not
        supported.
 
@@ -666,6 +667,7 @@ color.ui::
 
 commit.template::
        Specify a file to use as the template for new commit messages.
+       "~/" and "~user/" are expanded to the specified user's home directory.
 
 diff.autorefreshindex::
        When using 'git-diff' to compare with work tree