Merge pull request #831 from arcresu/idea

Consolidate various IDE tempates into Global/JetBrains template
2013-11-11 05:25:58 -08:00 · 2013-11-11 05:25:58 -08:00 · 2fea1b6b92
commit 2fea1b6b92
parent 9463c86d9b 4f659df36e
7 changed files with 20 additions and 18 deletions
--- a/Android.gitignore
+++ b/Android.gitignore
@ -21,9 +21,3 @@ local.properties

 # Proguard folder generated by Eclipse
 proguard/
-
-# Intellij project files
-*.iml
-*.ipr
-*.iws
-.idea/
--- a/Global/IntelliJ.gitignore
+++ b/Global/IntelliJ.gitignore
@ -1,5 +0,0 @@
-*.iml
-*.ipr
-*.iws
-.idea/
-out/
--- a/Global/JetBrains.gitignore
+++ b/Global/JetBrains.gitignore
@ -0,0 +1,20 @@
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode
+
+## Directory-based project format
+.idea/
+# if you remove the above rule, at least ignore user-specific stuff:
+# .idea/workspace.xml
+# .idea/tasks.xml
+# and these sensitive or high-churn files:
+# .idea/dataSources.ids
+# .idea/dataSources.xml
+# .idea/sqlDataSources.xml
+# .idea/dynamic.xml
+
+## File-based project format
+*.ipr
+*.iws
+*.iml
+
+## Additional for IntelliJ
+out/
--- a/Global/PhPStorm.gitignore
+++ b/Global/PhPStorm.gitignore
@ -1 +0,0 @@
-.idea/
--- a/Global/PyCharm.gitignore
+++ b/Global/PyCharm.gitignore
@ -1,4 +0,0 @@
-# PyCharm
-# http://www.jetbrains.com/pycharm/webhelp/project.html
-.idea
-.iml
--- a/Global/RubyMine.gitignore
+++ b/Global/RubyMine.gitignore
@ -1 +0,0 @@
-.idea/workspace.xml
--- a/Objective-C.gitignore
+++ b/Objective-C.gitignore
@ -16,7 +16,6 @@ xcuserdata
 profile
 *.moved-aside
 DerivedData
-.idea/
 *.hmap
 *.xccheckout