Merge branch 'master' into next

[i3/i3] / .gitignore

diff --git a/.gitignore b/.gitignore
index 3eac9270a91e887a8f3f10b0e579c9269b20b9de..26c170f2b4e4e0177afd1b171e4b059f83b3aefc 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,31 +1,26 @@
 *.o
 tags
 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.*
 *.yy.c
-man/i3-msg.1
-man/i3-msg.xml
-man/i3-msg.html
-man/i3-nagbar.1
-man/i3-nagbar.xml
-man/i3-nagbar.html
-man/i3-wsbar.1
-man/i3-wsbar.xml
-man/i3-wsbar.html
-man/i3-input.1
-man/i3-input.xml
-man/i3-input.html
-man/i3.1
-man/i3.xml
-man/i3.html
+man/*.1
+man/*.xml
+man/*.html
 *.tar.bz2*
 i3
 i3-input/i3-input
@@ -35,3 +30,5 @@ i3-config-wizard/i3-config-wizard
 i3-dump-log/i3-dump-log
 libi3.a
 docs/*.pdf
+docs/*.html
+!/docs/refcard.html