Merge pull request wang-bin#685 from Horosphere/IgnoreHiddenByDefault

Ignore hidden by default
jeffjuan · Jul 20, 2016 · 51fb475 · 51fb475
2 parents 319400a + 5ee39fc
commit 51fb475
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,14 +1,20 @@
 CVS
 .#*
 
-.hg
-.hgignore
+# Hidden files are ignored by default with exceptions
+.*
+!/.gitignore
+!/.gitmodules
+!/.qmake.conf
+!/.travis.yml
+
+# .install files in debian/ are generated and ignored
+debian/*.install
 
 obj
 TestResults
 *.pbxuser
 *.perspectivev3
-.DS_Store
 
 *.old
 *.log
@@ -47,9 +53,6 @@ Makefile*
 *.ilk
 
 #dirs
-.moc
-.rcc
-.obj
 /bin*
 /lib*
 build
@@ -67,5 +70,4 @@ Release
 *qrc_res.cpp
 
 #cache
-*.pyc
 *.swp