summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-12-06 17:23:43 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-12-06 17:23:43 (GMT)
commitf65ab574441f6ed9e59e50be68480bd698d9c749 (patch)
tree7b3ac54cf77242ed35ad255ebd0c0ef3a97d94dd /Documentation
parent714485c7deb63e91b1ee7ba07be5f5a55fe03a39 (diff)
parentff4c9b413a54dd62d155c32188f5a17b33eb2853 (diff)
downloadgit-f65ab574441f6ed9e59e50be68480bd698d9c749.zip
git-f65ab574441f6ed9e59e50be68480bd698d9c749.tar.gz
git-f65ab574441f6ed9e59e50be68480bd698d9c749.tar.bz2
Merge branch 'sp/doc-info-attributes'
Doc update. * sp/doc-info-attributes: doc: Mention info/attributes in gitrepository-layout
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/gitrepository-layout.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/gitrepository-layout.txt b/Documentation/gitrepository-layout.txt
index adf9554..c60bcad 100644
--- a/Documentation/gitrepository-layout.txt
+++ b/Documentation/gitrepository-layout.txt
@@ -208,6 +208,10 @@ info/exclude::
'git clean' look at it but the core Git commands do not look
at it. See also: linkgit:gitignore[5].
+info/attributes::
+ Defines which attributes to assign to a path, similar to per-directory
+ `.gitattributes` files. See also: linkgit:gitattributes[5].
+
info/sparse-checkout::
This file stores sparse checkout patterns.
See also: linkgit:git-read-tree[1].