aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrendan Forster <brendan@github.com>2017-01-28 12:22:57 +0100
committerGitHub <noreply@github.com>2017-01-28 12:22:57 +0100
commitac8884009eb77e43de76e4db24d9d0a496fe84c4 (patch)
treed51ee46ee14f5a19c81325de4cbfa2ee92918793
parent6fd222d8603c542a3ba299de0ccd5cc36018d712 (diff)
parent2cb9cf4ebd44d244e46463808fa6f0be9415f931 (diff)
downloadgitignore-ac8884009eb77e43de76e4db24d9d0a496fe84c4.tar.gz
gitignore-ac8884009eb77e43de76e4db24d9d0a496fe84c4.zip
Merge pull request #2163 from commscheck/xcode-source-control
Update Objective-C and Swift to match Xcode.gitignore
-rw-r--r--Objective-C.gitignore3
-rw-r--r--Swift.gitignore3
2 files changed, 4 insertions, 2 deletions
diff --git a/Objective-C.gitignore b/Objective-C.gitignore
index 58c51eca..af90c007 100644
--- a/Objective-C.gitignore
+++ b/Objective-C.gitignore
@@ -19,7 +19,8 @@ xcuserdata/
## Other
*.moved-aside
-*.xcuserstate
+*.xccheckout
+*.xcscmblueprint
## Obj-C/Swift specific
*.hmap
diff --git a/Swift.gitignore b/Swift.gitignore
index 7bcc61ba..099d22ae 100644
--- a/Swift.gitignore
+++ b/Swift.gitignore
@@ -19,7 +19,8 @@ xcuserdata/
## Other
*.moved-aside
-*.xcuserstate
+*.xccheckout
+*.xcscmblueprint
## Obj-C/Swift specific
*.hmap