summaryrefslogtreecommitdiff
path: root/doc/README.md
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2016-10-12 14:05:20 +0000
committerAchilleas Pipinellis <axilleas@axilleas.me>2016-10-12 14:05:20 +0000
commit9b04e69a1fcb4a39d2873e5e6a396f7f16884098 (patch)
tree48ad40786daceda905de7f9c886131c744311cd2 /doc/README.md
parent30e6c1bc136aa50e548fb4f48b2f5882e0267ad0 (diff)
parent45418734311561bb72aa5ab7a89d81bbd5705f7a (diff)
downloadgitlab-ce-9b04e69a1fcb4a39d2873e5e6a396f7f16884098.tar.gz
Merge branch 'git-attributes-documentation' into 'master'
Added documentation chapter for Git attributes See https://gitlab.com/gitlab-org/gitlab_git/issues/28 for more information. See merge request !6826
Diffstat (limited to 'doc/README.md')
-rw-r--r--doc/README.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/README.md b/doc/README.md
index 42ee44f83dc..7e3d9b00900 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -20,6 +20,7 @@
- [Webhooks](web_hooks/web_hooks.md) Let GitLab notify you when new code has been pushed to your project.
- [Workflow](workflow/README.md) Using GitLab functionality and importing projects from GitHub and SVN.
- [University](university/README.md) Learn Git and GitLab through videos and courses.
+- [Git Attributes](user/project/git_attributes.md) Managing Git attributes using a `.gitattributes` file.
## Administrator documentation