Skip to content

Commit 00e1848

Browse files
committed
Merge branch 'jc/no-default-attr-tree-in-bare' into maint-2.45
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
2 parents df98236 + 5c71d6b commit 00e1848

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

Documentation/config/attr.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
attr.tree::
22
A reference to a tree in the repository from which to read attributes,
3-
instead of the `.gitattributes` file in the working tree. In a bare
4-
repository, this defaults to `HEAD:.gitattributes`. If the value does
5-
not resolve to a valid tree object, an empty tree is used instead.
3+
instead of the `.gitattributes` file in the working tree. If the value
4+
does not resolve to a valid tree object, an empty tree is used instead.
65
When the `GIT_ATTR_SOURCE` environment variable or `--attr-source`
76
command line option are used, this configuration variable has no effect.

0 commit comments

Comments
 (0)