summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore19
1 files changed, 9 insertions, 10 deletions
diff --git a/.gitignore b/.gitignore
index e9bf3c2205..51b0a38e0a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,10 @@
.DS_Store
._*
+# Merge files
+*.orig
+*.rej
+
# Build artifacts
.clang_complete
.build/
@@ -27,16 +31,11 @@ quantum/version.h
*.uf2
# Old-style QMK Makefiles
-/keyboards/*/Makefile
-/keyboards/*/*/Makefile
-/keyboards/*/*/*/Makefile
-/keyboards/*/*/*/*/Makefile
-/keyboards/*/*/*/*/*/Makefile
-/keyboards/*/keymaps/Makefile
-/keyboards/*/*/keymaps/Makefile
-/keyboards/*/*/*/keymaps/Makefile
-/keyboards/*/*/*/*/keymaps/Makefile
-/keyboards/*/*/*/*/*/keymaps/Makefile
+/keyboards/**/Makefile
+
+# kbfirmware....
+/keyboards/**/kb.h
+/keyboards/**/kb.c
# Eclipse/PyCharm/Other IDE Settings
*.iml