diff options
| author | Thomas Van Lenten <thomasvl@google.com> | 2016-05-19 10:08:51 -0400 |
|---|---|---|
| committer | Thomas Van Lenten <thomasvl@google.com> | 2016-05-19 10:08:51 -0400 |
| commit | daec44fa5276171cada21e889111c600dadfd1ff (patch) | |
| tree | 21a041d466ef34af3febbc3d22006e8a7d1edd6c /.gitignore | |
| parent | 431ba4b37dfa9f5fcb672f738859d76c91065683 (diff) | |
| download | protobuf-daec44fa5276171cada21e889111c600dadfd1ff.tar.gz protobuf-daec44fa5276171cada21e889111c600dadfd1ff.tar.bz2 protobuf-daec44fa5276171cada21e889111c600dadfd1ff.zip | |
Expand the OS X/Xcode gitignores
- Add the folder CocoaPods will add to the root folder.
- Move and expand the entries in the objectivec directory.
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 12 |
1 files changed, 5 insertions, 7 deletions
@@ -88,16 +88,14 @@ build_msvc # packages themselves. /csharp/src/packages/*/ -# Directories created by opening the Objective C Xcode projects. -objectivec/ProtocolBuffers_OSX.xcodeproj/project.xcworkspace/xcuserdata/ -objectivec/ProtocolBuffers_OSX.xcodeproj/project.xcworkspace/xcshareddata/ProtocolBuffers_OSX.xccheckout -objectivec/ProtocolBuffers_OSX.xcodeproj/xcuserdata/ -objectivec/ProtocolBuffers_iOS.xcodeproj/project.xcworkspace/xcuserdata/ -objectivec/ProtocolBuffers_iOS.xcodeproj/project.xcworkspace/xcshareddata/ProtocolBuffers_iOS.xccheckout -objectivec/ProtocolBuffers_iOS.xcodeproj/xcuserdata/ # OS X's Finder creates these for state about opened windows/etc. **/.DS_Store +# Cocoapods artifacts +# Podfile.lock and the workspace file are tracked, to ease deleting them. That's +# needed to trigger "pod install" to rerun the preinstall commands. +Pods/ + # Comformance test output conformance/.libs/ conformance/com/ |