summary refs log tree commit diff
diff options
context:
space:
mode:
authorJeremy Cowgar <jeremy@cowgar.com>2017-09-20 13:38:27 -0400
committerJack Humbert <jack.humb@gmail.com>2017-09-21 00:15:53 -0400
commit064f682103dff1bd7b1dfea4d44ca34827d061a1 (patch)
tree95d3fd57eee2946102b9a02f7c722a7ae9f4917f
parent32d6a8b7ecdc653bd032e2bd32cfb8bb3183c904 (diff)
Instruct VSCode to indent using spaces, also ignore two temp files created by VSCode.
-rw-r--r--.gitignore4
-rw-r--r--.vscode/settings.json2
2 files changed, 5 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index e766619098..e77127268b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,6 +39,8 @@ util/Win_Check_Output.txt
 # Let these ones be user specific, since we have so many different configurations
 .vscode/launch.json
 .vscode/tasks.json
+.vscode/last.sql
+.vscode/temp.sql
 .stfolder
 
 # ignore image files
@@ -47,7 +49,7 @@ util/Win_Check_Output.txt
 *.gif
 
 # Do not ignore MiniDox left/right hand eeprom files
-!keyboards/minidox/*.eep 
+!keyboards/minidox/*.eep
 
 # things travis sees
 secrets.tar
diff --git a/.vscode/settings.json b/.vscode/settings.json
index be0b85b78f..afe8341d0e 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,5 +1,7 @@
 // Place your settings in this file to overwrite default and user settings.
 {
+    // Unofficially, QMK uses spaces for indentation
+    "editor.insertSpaces": true,
     // Configure glob patterns for excluding files and folders.
     "files.exclude": {
         "**/.build": true,