diff options
author | Lin Jen-Shin <godfat@godfat.org> | 2017-10-12 16:12:25 +0300 |
---|---|---|
committer | Lin Jen-Shin <godfat@godfat.org> | 2017-10-12 16:12:25 +0300 |
commit | 122003917530f3fc07e8fee3716d5df5d2d964e7 (patch) | |
tree | 0e600370c10e86c486ee74d5eae44a5c07d39adf /vendor/gitignore/Global | |
parent | 1e4b75ba40570a3e96e1999e375a120c4ba8b346 (diff) |
Update templates via:
bin/rake gitlab:update_templates
Diffstat (limited to 'vendor/gitignore/Global')
-rw-r--r-- | vendor/gitignore/Global/Matlab.gitignore | 2 | ||||
-rw-r--r-- | vendor/gitignore/Global/Xcode.gitignore | 18 | ||||
-rw-r--r-- | vendor/gitignore/Global/macOS.gitignore | 2 |
3 files changed, 11 insertions, 11 deletions
diff --git a/vendor/gitignore/Global/Matlab.gitignore b/vendor/gitignore/Global/Matlab.gitignore index 09dfde64b5f..cca150a88dd 100644 --- a/vendor/gitignore/Global/Matlab.gitignore +++ b/vendor/gitignore/Global/Matlab.gitignore @@ -19,4 +19,4 @@ slprj/ octave-workspace # Simulink autosave extension -.autosave +*.autosave diff --git a/vendor/gitignore/Global/Xcode.gitignore b/vendor/gitignore/Global/Xcode.gitignore index 37de8bb4793..cd0c7d3e45a 100644 --- a/vendor/gitignore/Global/Xcode.gitignore +++ b/vendor/gitignore/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 diff --git a/vendor/gitignore/Global/macOS.gitignore b/vendor/gitignore/Global/macOS.gitignore index 9d1061e8bc4..135767fc075 100644 --- a/vendor/gitignore/Global/macOS.gitignore +++ b/vendor/gitignore/Global/macOS.gitignore @@ -1,5 +1,5 @@ # General -*.DS_Store +.DS_Store .AppleDouble .LSOverride |