aboutsummaryrefslogtreecommitdiffstats
path: root/Global
diff options
context:
space:
mode:
authorBrendan Forster <brendan@github.com>2016-01-27 15:27:31 +1030
committerBrendan Forster <brendan@github.com>2016-01-27 15:27:31 +1030
commit352c903c34b896207162cf76442753cc9d76d946 (patch)
tree65bfa4197ec3acc8e358f0dc7449cf50a70dfdd4 /Global
parent8ae0b3e125ecc358600189877b5ce5af2b49e423 (diff)
parentf17925fe612c42e8d3a5a61beb555ed610d98c6f (diff)
downloadgitignore-352c903c34b896207162cf76442753cc9d76d946.tar.gz
gitignore-352c903c34b896207162cf76442753cc9d76d946.zip
Merge pull request #1546 from Coeur/patch-1
DerivedData and xcuserdata are folders; *.xcuserstate is always inside
Diffstat (limited to 'Global')
-rw-r--r--Global/Xcode.gitignore8
1 files changed, 4 insertions, 4 deletions
diff --git a/Global/Xcode.gitignore b/Global/Xcode.gitignore
index d07b7894..37de8bb4 100644
--- a/Global/Xcode.gitignore
+++ b/Global/Xcode.gitignore
@@ -4,7 +4,7 @@
## Build generated
build/
-DerivedData
+DerivedData/
## Various settings
*.pbxuser
@@ -15,9 +15,9 @@ DerivedData
!default.mode2v3
*.perspectivev3
!default.perspectivev3
-xcuserdata
+xcuserdata/
## Other
-*.xccheckout
*.moved-aside
-*.xcuserstate
+*.xccheckout
+*.xcscmblueprint