aboutsummaryrefslogtreecommitdiffstats
path: root/attr.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2023-10-30 07:09:55 +0900
committerJunio C Hamano <gitster@pobox.com>2023-10-30 07:09:55 +0900
commit26dd307cfaabe3d3f0b01aad64969e76a317811a (patch)
tree7f7f48e785ab297fe1718c5b954f7c6be71d9653 /attr.h
parent8183b63ff6a9c7eec5555e51e127e712efb64704 (diff)
parent9f9c40cf34c29d4ad700d9869435d159056fa6fb (diff)
downloadgit-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 'attr.h')
-rw-r--r--attr.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/attr.h b/attr.h
index 2b745df405..127998ae01 100644
--- a/attr.h
+++ b/attr.h
@@ -236,4 +236,6 @@ const char *git_attr_global_file(void);
/* Return whether the system gitattributes file is enabled and should be used. */
int git_attr_system_is_enabled(void);
+extern const char *git_attr_tree;
+
#endif /* ATTR_H */