aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorVirtualTam <virtualtam+github@flibidi.net>2017-10-16 19:18:29 +0200
committerGitHub <noreply@github.com>2017-10-16 19:18:29 +0200
commit839566500c31c139ad5e1ddd728633869c118a44 (patch)
tree1bfc15ca1d5740ab8ca66fe847c29adfc0966fa7
parent9f32160c323e77237e4051056c1f1061586cc12e (diff)
parente9619cc4f8717c1b8b66f60998cf8402bb983349 (diff)
downloadShaarli-839566500c31c139ad5e1ddd728633869c118a44.tar.gz
Shaarli-839566500c31c139ad5e1ddd728633869c118a44.tar.zst
Shaarli-839566500c31c139ad5e1ddd728633869c118a44.zip
Merge pull request #995 from virtualtam/lint/editorconfig
Add EditorConfig configuration
-rw-r--r--.editorconfig23
-rw-r--r--.gitattributes1
2 files changed, 24 insertions, 0 deletions
diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000..5abbd7bf
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,23 @@
1# EditorConfig: http://EditorConfig.org
2
3root = true
4
5[*]
6charset = utf-8
7end_of_line = lf
8insert_final_newline = true
9trim_trailing_whitespace = true
10indent_style = space
11indent_size = 4
12
13[*.{html,xml}]
14indent_size = 2
15
16[*.php]
17max_line_length = 100
18
19[Dockerfile]
20max_line_length = 80
21
22[Makefile]
23indent_style = tab
diff --git a/.gitattributes b/.gitattributes
index dd0e573c..93900602 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -24,6 +24,7 @@ Dockerfile text
24*.min.js binary 24*.min.js binary
25 25
26# Exclude from Git archives 26# Exclude from Git archives
27.editorconfig export-ignore
27.gitattributes export-ignore 28.gitattributes export-ignore
28.github export-ignore 29.github export-ignore
29.gitignore export-ignore 30.gitignore export-ignore