diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-10-29 22:09:55 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-10-29 22:09:55 (GMT) |
| commit | 26dd307cfaabe3d3f0b01aad64969e76a317811a (patch) | |
| tree | 7f7f48e785ab297fe1718c5b954f7c6be71d9653 /Documentation/config.txt | |
| parent | 8183b63ff6a9c7eec5555e51e127e712efb64704 (diff) | |
| parent | 9f9c40cf34c29d4ad700d9869435d159056fa6fb (diff) | |
| download | git-26dd307cfaabe3d3f0b01aad64969e76a317811a.zip git-26dd307cfaabe3d3f0b01aad64969e76a317811a.tar.gz git-26dd307cfaabe3d3f0b01aad64969e76a317811a.tar.bz2 | |
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.txt')
| -rw-r--r-- | Documentation/config.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index b1dba1a..e3a74dd 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -371,6 +371,8 @@ other popular tools, and describe them in your documentation. include::config/advice.txt[] +include::config/attr.txt[] + include::config/core.txt[] include::config/add.txt[] |