diff options
author | QMK Bot <hello@qmk.fm> | 2021-07-02 06:09:01 +0000 |
---|---|---|
committer | QMK Bot <hello@qmk.fm> | 2021-07-02 06:09:01 +0000 |
commit | 371d3bfbdd0bd863aa161b631b472c2a44f19633 (patch) | |
tree | e2857670162f5546ecd108c82f425b6f0363acd9 /.gitignore | |
parent | b721e054a2fcb5de5e45a30c07dfe32f11dfb017 (diff) | |
parent | 50468835311da76aa80fdeae0a7d01c944af3ff7 (diff) |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 87 |
1 files changed, 47 insertions, 40 deletions
diff --git a/.gitignore b/.gitignore index adc5d9da6a..b30b87ba11 100644 --- a/.gitignore +++ b/.gitignore @@ -1,36 +1,33 @@ -.history/ -.dep -*.o -*.bin -*.eep +# Junk files +*.bak +*.swp +*~ +.DS_Store + +# Build artifacts +.clang_complete +.build/ *.elf -*.hex -*.uf2 -*.qmk -!util/bootloader.hex -!quantum/tools/eeprom_reset.hex *.log *.lss *.lst *.map +*.o +*.stackdump *.sym -*.swp -tags -*~ + +# QMK-specific api_data/v1 -build/ -.build/ -*.bak -.vagrant/ -quantum/version.h -.idea/ -CMakeLists.txt -cmake-build-debug -.clang_complete doxygen/ -.DS_Store -/util/wsl_downloaded -/util/win_downloaded +quantum/version.h +!quantum/tools/eeprom_reset.hex +*.bin +*.eep +*.hex +*.qmk +*.uf2 + +# Old-style QMK Makefiles /keyboards/*/Makefile /keyboards/*/*/Makefile /keyboards/*/*/*/Makefile @@ -43,39 +40,49 @@ doxygen/ /keyboards/*/*/*/*/*/keymaps/Makefile # Eclipse/PyCharm/Other IDE Settings +*.iml +.browse.VC.db* .cproject +.idea +.idea/ .project .settings/ -.idea -*.iml -.browse.VC.db* -*.stackdump +.vagrant/ + +# ? +.dep +.history/ +build/ +cmake-build-debug +CMakeLists.txt + # Let these ones be user specific, since we have so many different configurations *.code-workspace +.stfolder +.tags .vscode/c_cpp_properties.json +.vscode/ipch/ +.vscode/last.sql .vscode/launch.json .vscode/tasks.json -.vscode/last.sql .vscode/temp.sql -.vscode/ipch/ -.stfolder -.tags +tags -# ignore image files -*.png +# Ignore image files *.gif *.jpg +*.png -# things travis sees -secrets.tar -id_rsa_* +# Things Travis sees /.vs +id_rsa_* +secrets.tar -# python things +# Python things __pycache__ .python-version -# prerequisites for updating ChibiOS +# Prerequisites for updating ChibiOS /util/fmpp* # Allow to exist but don't include it in the repo |