Skip to content

Commit

Permalink
Merge branch 'jc/no-default-attr-tree-in-bare' into maint-2.45
Browse files Browse the repository at this point in the history
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
  • Loading branch information
gitster committed Jul 2, 2024
2 parents df98236 + 5c71d6b commit 00e1848
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions Documentation/config/attr.txt
Original file line number Diff line number Diff line change
@@ -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.

0 comments on commit 00e1848

Please sign in to comment.