Merge remote-tracking branch 'upstream/master'

[qmk_firmware.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 0fd85b53143e75f8b4c4ebdee59d1d30520b2644..8c85d6ffa8882c607fa4f91ba048e74ef466e8e3 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -3,9 +3,28 @@
 *.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*