diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-07-09 09:00:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-09 09:00:36 -0700 |
| commit | d02d7ac303b1a22c7de4a6c3a00074d38b498134 (patch) | |
| tree | 00bb203b30a44c8e389119694f722a5d09bcda49 /Documentation/config.txt | |
| parent | 8228a23b35f6bd34a87d4d839d06e7c18ae9e750 (diff) | |
| parent | 0e8593dc5b812df00400347e88f5707225fe831e (diff) | |
| download | git-d02d7ac303b1a22c7de4a6c3a00074d38b498134.tar.gz | |
Merge branch 'mm/config-xdg'
Teach git to read various information from $XDG_CONFIG_HOME/git/ to allow
the user to avoid cluttering $HOME.
* mm/config-xdg:
config: write to $XDG_CONFIG_HOME/git/config file when appropriate
Let core.attributesfile default to $XDG_CONFIG_HOME/git/attributes
Let core.excludesfile default to $XDG_CONFIG_HOME/git/ignore
config: read (but not write) from $XDG_CONFIG_HOME/git/config file
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 0bcea8a949..c6ff15e594 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -484,7 +484,9 @@ core.excludesfile:: '.git/info/exclude', git looks into this file for patterns of files which are not meant to be tracked. "`~/`" is expanded to the value of `$HOME` and "`~user/`" to the specified user's - home directory. See linkgit:gitignore[5]. + home directory. Its default value is $XDG_CONFIG_HOME/git/ignore. + If $XDG_CONFIG_HOME is either not set or empty, $HOME/.config/git/ignore + is used instead. See linkgit:gitignore[5]. core.askpass:: Some commands (e.g. svn and http interfaces) that interactively @@ -499,7 +501,9 @@ core.attributesfile:: In addition to '.gitattributes' (per-directory) and '.git/info/attributes', git looks into this file for attributes (see linkgit:gitattributes[5]). Path expansions are made the same - way as for `core.excludesfile`. + way as for `core.excludesfile`. Its default value is + $XDG_CONFIG_HOME/git/attributes. If $XDG_CONFIG_HOME is either not + set or empty, $HOME/.config/git/attributes is used instead. core.editor:: Commands such as `commit` and `tag` that lets you edit |