From aa00e7f210e4d4637efeaae6f3699c767ddbd72b Mon Sep 17 00:00:00 2001 From: Carl Suster Date: Sat, 9 Nov 2013 07:20:56 +1100 Subject: [PATCH 1/7] Add an IDEA template to cover all related IDEs --- Global/IDEA.gitignore | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 Global/IDEA.gitignore diff --git a/Global/IDEA.gitignore b/Global/IDEA.gitignore new file mode 100644 index 00000000..47dc3447 --- /dev/null +++ b/Global/IDEA.gitignore @@ -0,0 +1,15 @@ +# 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/dataSources.ids +# .idea/dataSources.xml +# .idea/sqlDataSources.xml +# .idea/dynamic.xml + +## File-based project format +*.ipr +*.iws +*.iml From fcf0a9ccab203f2657f70489eff476c6f4556926 Mon Sep 17 00:00:00 2001 From: Carl Suster Date: Sat, 9 Nov 2013 07:22:55 +1100 Subject: [PATCH 2/7] Remove individual JetBrains IDE templates in favour of IDEA template --- Global/IntelliJ.gitignore | 5 ----- Global/PhPStorm.gitignore | 1 - Global/PyCharm.gitignore | 4 ---- Global/RubyMine.gitignore | 1 - 4 files changed, 11 deletions(-) delete mode 100644 Global/IntelliJ.gitignore delete mode 100644 Global/PhPStorm.gitignore delete mode 100644 Global/PyCharm.gitignore delete mode 100644 Global/RubyMine.gitignore diff --git a/Global/IntelliJ.gitignore b/Global/IntelliJ.gitignore deleted file mode 100644 index 7576fded..00000000 --- a/Global/IntelliJ.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -*.iml -*.ipr -*.iws -.idea/ -out/ diff --git a/Global/PhPStorm.gitignore b/Global/PhPStorm.gitignore deleted file mode 100644 index 9f11b755..00000000 --- a/Global/PhPStorm.gitignore +++ /dev/null @@ -1 +0,0 @@ -.idea/ diff --git a/Global/PyCharm.gitignore b/Global/PyCharm.gitignore deleted file mode 100644 index 57272810..00000000 --- a/Global/PyCharm.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -# PyCharm -# http://www.jetbrains.com/pycharm/webhelp/project.html -.idea -.iml diff --git a/Global/RubyMine.gitignore b/Global/RubyMine.gitignore deleted file mode 100644 index 1cc4572e..00000000 --- a/Global/RubyMine.gitignore +++ /dev/null @@ -1 +0,0 @@ -.idea/workspace.xml From af9ec6115c8d6bdaa6f64c69764d9c2259361950 Mon Sep 17 00:00:00 2001 From: Carl Suster Date: Sat, 9 Nov 2013 07:36:40 +1100 Subject: [PATCH 3/7] Add .idea/tasks.xmk to IDEA ignore suggections --- Global/IDEA.gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Global/IDEA.gitignore b/Global/IDEA.gitignore index 47dc3447..490d877e 100644 --- a/Global/IDEA.gitignore +++ b/Global/IDEA.gitignore @@ -4,6 +4,8 @@ .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 From 1ef80036f0f77ea92daa5e941d4bcf8722eb414b Mon Sep 17 00:00:00 2001 From: Carl Suster Date: Sat, 9 Nov 2013 07:37:49 +1100 Subject: [PATCH 4/7] Remove .idea/ from ObjectiveC in favour of Global/IDEA --- Objective-C.gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/Objective-C.gitignore b/Objective-C.gitignore index 8dcee63e..af228cde 100644 --- a/Objective-C.gitignore +++ b/Objective-C.gitignore @@ -16,7 +16,6 @@ xcuserdata profile *.moved-aside DerivedData -.idea/ *.hmap *.xccheckout From af886f72c89463389b476ef4c94f9c0d847be217 Mon Sep 17 00:00:00 2001 From: Carl Suster Date: Sat, 9 Nov 2013 08:04:35 +1100 Subject: [PATCH 5/7] Add back out/ for IntelliJ under IDEA --- Global/IDEA.gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Global/IDEA.gitignore b/Global/IDEA.gitignore index 490d877e..9f20c505 100644 --- a/Global/IDEA.gitignore +++ b/Global/IDEA.gitignore @@ -15,3 +15,6 @@ *.ipr *.iws *.iml + +## Additional for IntelliJ +out/ From 9ae01d0b642e9513bd8995baf7ab6753a86d064b Mon Sep 17 00:00:00 2001 From: Carl Suster Date: Sat, 9 Nov 2013 08:14:41 +1100 Subject: [PATCH 6/7] Rename template IDEA->JetBrains --- Global/{IDEA.gitignore => JetBrains.gitignore} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Global/{IDEA.gitignore => JetBrains.gitignore} (100%) diff --git a/Global/IDEA.gitignore b/Global/JetBrains.gitignore similarity index 100% rename from Global/IDEA.gitignore rename to Global/JetBrains.gitignore From 4f659df36e638125a11e47573ad714f8fe75ff6b Mon Sep 17 00:00:00 2001 From: Carl Suster Date: Sat, 9 Nov 2013 13:02:44 +1100 Subject: [PATCH 7/7] Remove IntelliJ rules from Android -> Global/JetBrains --- Android.gitignore | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Android.gitignore b/Android.gitignore index 648a292a..0f757f48 100644 --- 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/