diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-07-02 09:27:57 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-07-02 09:27:57 -0700 |
| commit | 00e1848087ee686ab723a0a688a29901712d01bf (patch) | |
| tree | 8c9d4b69e877a45554316c6965a260086c8c8843 | |
| parent | df98236ca49648a7ef54b83776cc681f22739018 (diff) | |
| parent | 5c71d6b63ac107a1c0f6e6a3f53f2b8371516292 (diff) | |
| download | git-00e1848087ee686ab723a0a688a29901712d01bf.tar.gz | |
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
| -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. |