aboutsummaryrefslogtreecommitdiffstats
path: root/Global
diff options
context:
space:
mode:
authorBrendan Forster <github@brendanforster.com>2017-09-09 11:28:52 +1000
committerGitHub <noreply@github.com>2017-09-09 11:28:52 +1000
commit60c74a6fcfd8e63acaabbd0e676af23a49a77f6b (patch)
treec13b5d212d2e36d8bd4835ba12e78407a3d317ea /Global
parent211cd81a69ae5116e8f89eefb333843dcf9b47e7 (diff)
parent81d78706fa205764893ab25d83f47a6240abad18 (diff)
downloadgitignore-60c74a6fcfd8e63acaabbd0e676af23a49a77f6b.tar.gz
gitignore-60c74a6fcfd8e63acaabbd0e676af23a49a77f6b.zip
Merge pull request #2410 from Coeur/patch-2
clarifying when ignoring is not required
Diffstat (limited to 'Global')
-rw-r--r--Global/Xcode.gitignore18
1 files changed, 9 insertions, 9 deletions
diff --git a/Global/Xcode.gitignore b/Global/Xcode.gitignore
index 37de8bb4..cd0c7d3e 100644
--- a/Global/Xcode.gitignore
+++ b/Global/Xcode.gitignore
@@ -2,11 +2,17 @@
#
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
-## Build generated
+## User settings
+xcuserdata/
+
+## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9)
+*.xcscmblueprint
+*.xccheckout
+
+## compatibility with Xcode 3 and earlier (ignoring not required starting Xcode 4)
build/
DerivedData/
-
-## Various settings
+*.moved-aside
*.pbxuser
!default.pbxuser
*.mode1v3
@@ -15,9 +21,3 @@ DerivedData/
!default.mode2v3
*.perspectivev3
!default.perspectivev3
-xcuserdata/
-
-## Other
-*.moved-aside
-*.xccheckout
-*.xcscmblueprint