diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-12-30 12:58:19 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-12-30 12:58:19 +0900 |
| commit | 148c8f38eee558b9ad7bd35e4af4b20c1be3056b (patch) | |
| tree | 8e7d90187d3a00df450ae4b7341c1575e659547d /Documentation | |
| parent | 4a8ee50c77adb6434f2c683f778f9db2249634a1 (diff) | |
| parent | 1722c2244bc0f5663c53f5dc8fc9ff5b8bf0e523 (diff) | |
| download | git-148c8f38eee558b9ad7bd35e4af4b20c1be3056b.tar.xz | |
Merge branch 'mh/doc-core-attributesfile'
Doc update.
* mh/doc-core-attributesfile:
docs: note the type of core.attributesfile
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config/core.adoc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Documentation/config/core.adoc b/Documentation/config/core.adoc index 01202da7cd..9bc9de29d9 100644 --- a/Documentation/config/core.adoc +++ b/Documentation/config/core.adoc @@ -492,10 +492,9 @@ core.askPass:: command-line argument and write the password on its STDOUT. 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`. Its default value is + Specifies the pathname to the file that contains attributes (see + linkgit:gitattributes[5]), in addition to `.gitattributes` (per-directory) + and `.git/info/attributes`. 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. |