Merge branch 'master' into fix_line_endings

[qmk_firmware.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 293c4523908f07042e1436dc8e3c831060e79d5c..07bbf13db1229e1c011943ee1a38be75ef08ab6a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,29 @@
 *.eep
 *.elf
 *.hex
+!util/bootloader.hex
+!quantum/tools/eeprom_reset.hex
+*.log
 *.lss
 *.lst
 *.map
 *.sym
+*.swp
+tags
+*~
+build/
+.build/
+*.bak
+.vagrant/
+quantum/version.h
+.idea/
+CMakeLists.txt
+.DS_STORE
+
+# Eclipse/PyCharm/Other IDE Settings
+.cproject
+.project
+.settings/
+.idea
+.browse.VC.db*
+*.stackdump