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

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 38c708642d5fc426dc226cdd0ef0a57e9fe2b89c..958006ca7673d0c3158fc3f8b16dcebbf11dd9eb 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -113,6 +113,21 @@ For command-specific variables, you will find a more detailed description
 in the appropriate manual page. You will find a description of non-core
 porcelain configuration variables in the respective porcelain documentation.
 
+advice.*::
+       When set to 'true', display the given optional help message.
+       When set to 'false', do not display. The configuration variables
+       are:
++
+--
+       pushNonFastForward::
+               Advice shown when linkgit:git-push[1] refuses
+               non-fast-forward refs. Default: true.
+       statusHints::
+               Directions on how to stage/unstage/add shown in the
+               output of linkgit:git-status[1] and the template shown
+               when writing commit messages. Default: true.
+--
+
 core.fileMode::
        If false, the executable bit differences between the index and
        the working copy are ignored; useful on broken filesystems like FAT.
@@ -365,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::
@@ -524,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.
 
@@ -651,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