Merge pull request #1882 from pi-hole/tweak/jetbrains_codestyle

Just ignore the whole .idea directory, execpt for the codeStyles
This commit is contained in:
Mark Drobnak 2017-12-30 15:32:19 -05:00 committed by GitHub
commit 891473c7fc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

10
.gitignore vendored
View file

@ -10,10 +10,11 @@ __pycache__
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
# User-specific stuff: # All idea files, with execptions
.idea/**/workspace.xml .idea
.idea/**/tasks.xml !.idea/codeStyles/*
.idea/dictionaries !.idea/codeStyleSettings.xml
# Sensitive or high-churn files: # Sensitive or high-churn files:
.idea/**/dataSources/ .idea/**/dataSources/
@ -64,7 +65,6 @@ fabric.properties
# Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-249601023 # Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-249601023
*.iml *.iml
modules.xml
.idea/misc.xml .idea/misc.xml
*.ipr *.ipr