浏览代码

Merge pull request #278 from square/kenw/update-gitignore-2

Update gitignore 2
Ken Wigginton 10 年之前
父节点
当前提交
20b501e79e
共有 1 个文件被更改,包括 20 次插入48 次删除
  1. 20 48
      .gitignore

+ 20 - 48
.gitignore

@@ -1,52 +1,24 @@
-#Ignore user-specific settings
+.idea/
+.env/
+*.egg-info
+reports/
+build/
+nohup.out
+.DS_Store
+xcuserdata/
+*.pbxuser
+!default.pbxuser
 *.mode1v3
+!default.mode1v3
 *.mode2v3
-*.pbxuser
+!default.mode2v3
 *.perspectivev3
+!default.perspectivev3
 *.xcworkspace
-xcuserdata
-
-#Ignore textmate build errors
-*.tm_build_errors
-
-#Ignore temp nibs and swap files
-*.swp
-*~.nib
-
-#Ignore the build, since we don't want archived builds
-build
-
-.gitattributes
-
-#Probably don't want to check in xcuserdata
-xcuserdata/
-*.xcworkspace/
-
-*.orig
-.idea
-
-#Ignore the token from the asset update script
-*.LastAssetUpdate_*
-
-env/
-
-.build_env/
-
-Frameworks/MerchantShared/DerivedSources/*
-!Frameworks/MerchantShared/DerivedSources/Makefile
-
-*.pyc
-
-# Instruments' output during UI Automation test
-traces
-instrumentscli*.trace
-
-git-cmp
-
-TestResults/*
-*/TestResults/*
-
-.clang-format
-
-.bin/
-.bundle/
+!default.xcworkspace
+*xcuserdata
+*.xccheckout
+profile
+*.moved-aside
+DerivedData
+extern/