Merge branch 'master' into next

[i3/i3] / .gitignore

diff --git a/.gitignore b/.gitignore
index 0ae9eaeb76e0987ec2e514b211edddb72db6c4de..26c170f2b4e4e0177afd1b171e4b059f83b3aefc 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,34 @@
 *.o
 tags
-loglevels.tmp
+include/GENERATED_*.h
+include/all.h.pch
 *.swp
 *.gcda
 *.gcno
 testcases/testsuite-*
 testcases/latest
+testcases/Makefile
+testcases/Makefile.old
+testcases/.last_run_timings.json
+testcases/_Inline
+testcases/inc
+testcases/META.yml
+test.commands_parser
+test.config_parser
 *.output
-*.tab.c
-*.tab.h
+*.tab.*
 *.yy.c
+man/*.1
+man/*.xml
+man/*.html
 *.tar.bz2*
+i3
+i3-input/i3-input
+i3-nagbar/i3-nagbar
+i3-msg/i3-msg
+i3-config-wizard/i3-config-wizard
+i3-dump-log/i3-dump-log
+libi3.a
+docs/*.pdf
+docs/*.html
+!/docs/refcard.html