diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-06-24 16:39:14 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-06-24 16:39:14 -0700 |
| commit | ae2f21b5609b959e700f12edb035b620164c239f (patch) | |
| tree | 7af2a852e09f673fef56ffb150ccd75fb796d2bc | |
| parent | Merge branch 'tb/precompose-getcwd' (diff) | |
| parent | attr.tree: HEAD:.gitattributes is no longer the default in a bare repo (diff) | |
| download | git-ae2f21b5609b959e700f12edb035b620164c239f.tar.gz git-ae2f21b5609b959e700f12edb035b620164c239f.zip | |
Merge branch 'jc/no-default-attr-tree-in-bare'
Earlier we stopped using the tree of HEAD as the default source of
attributes in a bare repository, but failed to document it. This
has been corrected.
* jc/no-default-attr-tree-in-bare:
attr.tree: HEAD:.gitattributes is no longer the default in a bare repo
| -rw-r--r-- | Documentation/config/attr.txt | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Documentation/config/attr.txt b/Documentation/config/attr.txt index 1a482d6af2..c4a5857993 100644 --- a/Documentation/config/attr.txt +++ b/Documentation/config/attr.txt @@ -1,7 +1,6 @@ attr.tree:: A reference to a tree in the repository from which to read attributes, - instead of the `.gitattributes` file in the working tree. In a bare - repository, this defaults to `HEAD:.gitattributes`. If the value does - not resolve to a valid tree object, an empty tree is used instead. + instead of the `.gitattributes` file in the working tree. If the value + does not resolve to a valid tree object, an empty tree is used instead. When the `GIT_ATTR_SOURCE` environment variable or `--attr-source` command line option are used, this configuration variable has no effect. |