style: add .json, .xproj to editoconfig/gitattributes, etc. Ignore .v…

…scode.
elgohr-update · Dec 12, 2016 · f2616eb · f2616eb
1 parent 93b4408
commit f2616eb
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -19,8 +19,8 @@ tab_width = 8
 indent_style = space
 indent_size = 4
 
-# 2 space indentation for ruby, yaml
-[*.{rb,yml,yaml}]
+# 2 space indentation for ruby, yaml, json
+[*.{rb,yml,yaml, json}]
 indent_style = space
 indent_size = 2
 

diff --git a/.gitattributes b/.gitattributes
@@ -20,6 +20,7 @@
 *.sass eol=lf
 *.less eol=lf
 *.js eol=lf
+*.json eol=lf
 *.lisp eol=lf
 *.clj eol=lf
 *.sql eol=lf
@@ -31,10 +32,18 @@
 *.fs eol=lf
 *.fsx eol=lf
 *.hs eol=lf
+*.yml eol=lf
+*.rs eol=lf
+
+
 
 *.csproj eol=crlf
+*.xproj eol=crlf
 *.vbproj eol=crlf
 *.fsproj eol=crlf
 *.dbproj eol=crlf
 *.sln eol=crlf
 *.txt eol=crlf
+
+.gitattributes eol=lf
+.gitignore eol=lf
diff --git a/.gitignore b/.gitignore
@@ -86,7 +86,7 @@ gmon.out
 
 
 # VSCode
-/.vscode/
+.vscode/
 
 .vs/
-Original file line number
+Diff line change
@@ Expand Up / @@ -86,7 +86,7 @@ gmon.out @@
     # VSCode
-    /.vscode/
+    .vscode/
     .vs/
@@ Expand Down @@