diff options
author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-10-12 22:37:04 +0300 |
---|---|---|
committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-10-12 22:37:04 +0300 |
commit | 2f2ad9eaf06e4573da77f9602fa9678711dba4d9 (patch) | |
tree | 0f0eb102b146da8358ec1ba0c81bf0498cdee4bd /doc/user/project | |
parent | 2e3bc85421ddfc814e81f75e3adb8a8c1d53093e (diff) | |
parent | 58e2b44afe535100508eb4d49d7e7df24e408383 (diff) |
Merge branch 'master' into feature/improve-mrwbs-and-todos-for-pipelines
* master:
Update health_check gem to `~> 2.2.0`
API: Version information
Revert "Merge branch 'tests-use-tmpfs' into 'master'"
Added documentation chapter for Git attributes
Use activerecord_sane_schema_dumper
Add a separate stage for bundle check
Add a bundle check step to ensure dependencies are correct
Create a new /templates API namespace
Add disabled delete button to protected branches
Make spec deterministic
refactors tests because of gitlab-test repository changes
Addresses Robert's feedback
Speed up specs for GET /projects/:id/events
API: New /users/:id/events endpoint
writes tests to verify the issue is solved and fixes breaking issues.
removes inconsistency regarding tagging immediately as merged once you create a branch using new branch button and adds changelog entry
Diffstat (limited to 'doc/user/project')
-rw-r--r-- | doc/user/project/git_attributes.md | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/doc/user/project/git_attributes.md b/doc/user/project/git_attributes.md new file mode 100644 index 00000000000..21ef94e61f7 --- /dev/null +++ b/doc/user/project/git_attributes.md @@ -0,0 +1,22 @@ +# Git Attributes + +GitLab supports defining custom [Git attributes][gitattributes] such as what +files to treat as binary, and what language to use for syntax highlighting +diffs. + +To define these attributes, create a file called `.gitattributes` in the root +directory of your repository and push it to the default branch of your project. + +## Encoding Requirements + +The `.gitattributes` file _must_ be encoded in UTF-8 and _must not_ contain a +Byte Order Mark. If a different encoding is used, the file's contents will be +ignored. + +## Syntax Highlighting + +The `.gitattributes` file can be used to define which language to use when +syntax highlighting files and diffs. See ["Syntax +Highlighting"](highlighting.md) for more information. + +[gitattributes]: https://git-scm.com/docs/gitattributes |