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
This commit is contained in:
Junio C Hamano 2024-06-24 16:39:14 -07:00
commit ae2f21b560

View file

@ -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.