Cleanup gitignore (#13390)

author: Ryan <fauxpark@gmail.com> 2021-07-02 16:08:34 +1000
committer: GitHub <noreply@github.com> 2021-07-02 16:08:34 +1000
commit: 50468835311da76aa80fdeae0a7d01c944af3ff7 (patch)
tree: e50868e7e080111e6f40ee99510bdb503355e4f0
parent: 6db4b49fec258d792fd88792e416f5ea684446c1 (diff)
download: qmk_firmware-50468835311da76aa80fdeae0a7d01c944af3ff7.tar.gz
qmk_firmware-50468835311da76aa80fdeae0a7d01c944af3ff7.zip
4 files changed, 47 insertions, 40 deletions
diff --git a/.gitignore b/.gitignore
index adc5d9da6..b30b87ba1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,36 +1,33 @@
-.history/
+# Junk files
-.dep
+*.bak
-*.o
+*.swp
-*.bin
+*~
-*.eep
+.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
+quantum/version.h
-/util/wsl_downloaded
+!quantum/tools/eeprom_reset.hex
-/util/win_downloaded
+*.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
+.vagrant/
-*.iml
-.browse.VC.db*
+# ?
-*.stackdump
+.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/
+tags
-.stfolder
-.tags
-# ignore image files
+# Ignore image files
-*.png
 *.gif
 *.jpg
+*.png
-# things travis sees
+# Things Travis sees
-secrets.tar
-id_rsa_*
 /.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
diff --git a/keyboards/planck/keymaps/ishtob/rule.mk b/keyboards/planck/keymaps/ishtob/rules.mk
index c8ba0c919..c8ba0c919 100755..100644
--- a/keyboards/planck/keymaps/ishtob/rule.mk
+++ b/keyboards/planck/keymaps/ishtob/rules.mk
diff --git a/keyboards/preonic/keymaps/that_canadian/Makefile b/keyboards/preonic/keymaps/that_canadian/rules.mk
index 773e5c45d..773e5c45d 100644
--- a/keyboards/preonic/keymaps/that_canadian/Makefile
+++ b/keyboards/preonic/keymaps/that_canadian/rules.mk
diff --git a/keyboards/wilba_tech/zeal60/keymaps/tusing/Makefile b/keyboards/wilba_tech/zeal60/keymaps/tusing/rules.mk
index 762905da0..762905da0 100644
--- a/keyboards/wilba_tech/zeal60/keymaps/tusing/Makefile
+++ b/keyboards/wilba_tech/zeal60/keymaps/tusing/rules.mk
author	Ryan <fauxpark@gmail.com>	2021-07-02 16:08:34 +1000
committer	GitHub <noreply@github.com>	2021-07-02 16:08:34 +1000
commit	50468835311da76aa80fdeae0a7d01c944af3ff7 (patch)
tree	e50868e7e080111e6f40ee99510bdb503355e4f0
parent	6db4b49fec258d792fd88792e416f5ea684446c1 (diff)
download	qmk_firmware-50468835311da76aa80fdeae0a7d01c944af3ff7.tar.gz qmk_firmware-50468835311da76aa80fdeae0a7d01c944af3ff7.zip

diff --git a/.gitignore b/.gitignore index adc5d9da6..b30b87ba1 100644 --- a/.gitignore +++ b/.gitignore
@@ -1,36 +1,33 @@
1	.history/	1	# Junk files
2	.dep	2	*.bak
3	*.o	3	*.swp
4	*.bin	4	*~
5	*.eep	5	.DS_Store
		6
		7	# Build artifacts
		8	.clang_complete
		9	.build/
6	*.elf	10	*.elf
7	*.hex
8	*.uf2
9	*.qmk
10	!util/bootloader.hex
11	!quantum/tools/eeprom_reset.hex
12	*.log	11	*.log
13	*.lss	12	*.lss
14	*.lst	13	*.lst
15	*.map	14	*.map
		15	*.o
		16	*.stackdump
16	*.sym	17	*.sym
17	*.swp	18
18	tags	19	# QMK-specific
19	*~
20	api_data/v1	20	api_data/v1
21	build/
22	.build/
23	*.bak
24	.vagrant/
25	quantum/version.h
26	.idea/
27	CMakeLists.txt
28	cmake-build-debug
29	.clang_complete
30	doxygen/	21	doxygen/
31	.DS_Store	22	quantum/version.h
32	/util/wsl_downloaded	23	!quantum/tools/eeprom_reset.hex
33	/util/win_downloaded	24	*.bin
		25	*.eep
		26	*.hex
		27	*.qmk
		28	*.uf2
		29
		30	# Old-style QMK Makefiles
34	/keyboards/*/Makefile	31	/keyboards/*/Makefile
35	/keyboards///Makefile	32	/keyboards///Makefile
36	/keyboards///*/Makefile	33	/keyboards///*/Makefile
@@ -43,39 +40,49 @@ doxygen/
43	/keyboards/////*/keymaps/Makefile	40	/keyboards/////*/keymaps/Makefile
44		41
45	# Eclipse/PyCharm/Other IDE Settings	42	# Eclipse/PyCharm/Other IDE Settings
		43	*.iml
		44	.browse.VC.db*
46	.cproject	45	.cproject
		46	.idea
		47	.idea/
47	.project	48	.project
48	.settings/	49	.settings/
49	.idea	50	.vagrant/
50	*.iml	51
51	.browse.VC.db*	52	# ?
52	*.stackdump	53	.dep
		54	.history/
		55	build/
		56	cmake-build-debug
		57	CMakeLists.txt
		58
53	# Let these ones be user specific, since we have so many different configurations	59	# Let these ones be user specific, since we have so many different configurations
54	*.code-workspace	60	*.code-workspace
		61	.stfolder
		62	.tags
55	.vscode/c_cpp_properties.json	63	.vscode/c_cpp_properties.json
		64	.vscode/ipch/
		65	.vscode/last.sql
56	.vscode/launch.json	66	.vscode/launch.json
57	.vscode/tasks.json	67	.vscode/tasks.json
58	.vscode/last.sql
59	.vscode/temp.sql	68	.vscode/temp.sql
60	.vscode/ipch/	69	tags
61	.stfolder
62	.tags
63		70
64	# ignore image files	71	# Ignore image files
65	*.png
66	*.gif	72	*.gif
67	*.jpg	73	*.jpg
		74	*.png
68		75
69	# things travis sees	76	# Things Travis sees
70	secrets.tar
71	id_rsa_*
72	/.vs	77	/.vs
		78	id_rsa_*
		79	secrets.tar
73		80
74	# python things	81	# Python things
75	__pycache__	82	__pycache__
76	.python-version	83	.python-version
77		84
78	# prerequisites for updating ChibiOS	85	# Prerequisites for updating ChibiOS
79	/util/fmpp*	86	/util/fmpp*
80		87
81	# Allow to exist but don't include it in the repo	88	# Allow to exist but don't include it in the repo


diff --git a/keyboards/planck/keymaps/ishtob/rule.mk b/keyboards/planck/keymaps/ishtob/rules.mk index c8ba0c919..c8ba0c919 100755..100644 --- a/keyboards/planck/keymaps/ishtob/rule.mk +++ b/keyboards/planck/keymaps/ishtob/rules.mk


diff --git a/keyboards/preonic/keymaps/that_canadian/Makefile b/keyboards/preonic/keymaps/that_canadian/rules.mk index 773e5c45d..773e5c45d 100644 --- a/keyboards/preonic/keymaps/that_canadian/Makefile +++ b/keyboards/preonic/keymaps/that_canadian/rules.mk


diff --git a/keyboards/wilba_tech/zeal60/keymaps/tusing/Makefile b/keyboards/wilba_tech/zeal60/keymaps/tusing/rules.mk index 762905da0..762905da0 100644 --- a/keyboards/wilba_tech/zeal60/keymaps/tusing/Makefile +++ b/keyboards/wilba_tech/zeal60/keymaps/tusing/rules.mk