diff options
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index 4473e291b7..7ccdefa656 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,10 @@ .DS_Store ._* +# Merge files +*.orig +*.rej + # Build artifacts .clang_complete .build/ @@ -27,7 +31,11 @@ quantum/version.h *.uf2 # Old-style QMK Makefiles -/keyboards/*/Makefile +/keyboards/**/Makefile + +# kbfirmware.... +/keyboards/**/kb.h +/keyboards/**/kb.c # Eclipse/PyCharm/Other IDE Settings *.iml @@ -58,10 +66,12 @@ CMakeLists.txt .vscode/temp.sql tags -# Ignore image files +# Ignore image/font files *.gif *.jpg *.png +*.ttf +*.otf # Things Travis sees /.vs |