diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-10-30 07:09:55 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-10-30 07:09:55 +0900 |
| commit | 26dd307cfaabe3d3f0b01aad64969e76a317811a (patch) | |
| tree | 7f7f48e785ab297fe1718c5b954f7c6be71d9653 /Documentation/config | |
| parent | 8183b63ff6a9c7eec5555e51e127e712efb64704 (diff) | |
| parent | 9f9c40cf34c29d4ad700d9869435d159056fa6fb (diff) | |
| download | git-26dd307cfaabe3d3f0b01aad64969e76a317811a.tar.gz | |
Merge branch 'jc/attr-tree-config'
The attribute subsystem learned to honor `attr.tree` configuration
that specifies which tree to read the .gitattributes files from.
* jc/attr-tree-config:
attr: add attr.tree for setting the treeish to read attributes from
attr: read attributes from HEAD when bare repo
Diffstat (limited to 'Documentation/config')
| -rw-r--r-- | Documentation/config/attr.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/config/attr.txt b/Documentation/config/attr.txt new file mode 100644 index 0000000000..1a482d6af2 --- /dev/null +++ b/Documentation/config/attr.txt @@ -0,0 +1,7 @@ +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. + When the `GIT_ATTR_SOURCE` environment variable or `--attr-source` + command line option are used, this configuration variable has no effect. |