summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhttp://jneen.net/ <jneen@jneen.net>2016-06-27 14:17:04 -0700
committerhttp://jneen.net/ <jneen@jneen.net>2016-06-27 14:17:49 -0700
commitffd8162191a5fab2a182da718fc5d83d6cd965fc (patch)
treef9b5536b4292fe74b4172b0aadba1addf11ec2ca
parentf06fe775311799d94b66319699e10ba40b1c1f24 (diff)
downloadgitlab-ce-ffd8162191a5fab2a182da718fc5d83d6cd965fc.tar.gz
doc: note that .gitattributes uses default branchfeature/custom-highlighting
-rw-r--r--doc/user/project/highlighting.md2
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/user/project/highlighting.md b/doc/user/project/highlighting.md
index 3988960a610..73a2d176b54 100644
--- a/doc/user/project/highlighting.md
+++ b/doc/user/project/highlighting.md
@@ -27,3 +27,5 @@ To disable highlighting entirely, use `gitlab-language=text`. Lots more fun shen
# an entire file of highlighting errors!
/other-file gitlab-language=text?token=Error
```
+
+Please note that these configurations will only take effect when the `.gitattributes` file is in your default branch (usually `master`).