Update gitconfig

.gitignore

@@ -1,23 +1,52 @@
-.idea/
-.env/
-*.egg-info
-reports/
-build/
-nohup.out
-.DS_Store
-xcuserdata/
-*.pbxuser
-!default.pbxuser
+#Ignore user-specific settings
 *.mode1v3
-!default.mode1v3
 *.mode2v3
-!default.mode2v3
+*.pbxuser
 *.perspectivev3
-!default.perspectivev3
 *.xcworkspace
-!default.xcworkspace
-*xcuserdata
-profile
-*.moved-aside
-DerivedData
-extern/
+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/

SocketRocket.xcodeproj/project.xcworkspace/xcshareddata/SocketRocket.xccheckout

@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IDESourceControlProjectFavoriteDictionaryKey</key>
-	<false/>
-	<key>IDESourceControlProjectIdentifier</key>
-	<string>B648E219-646D-48EA-8033-F2823B6879E3</string>
-	<key>IDESourceControlProjectName</key>
-	<string>SocketRocket</string>
-	<key>IDESourceControlProjectOriginsDictionary</key>
-	<dict>
-		<key>82B4653C-9497-408E-B1DC-123266231DC4</key>
-		<string>ssh://github.com/aaronvegh/SocketRocket.git</string>
-	</dict>
-	<key>IDESourceControlProjectPath</key>
-	<string>SocketRocket.xcodeproj/project.xcworkspace</string>
-	<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
-	<dict>
-		<key>82B4653C-9497-408E-B1DC-123266231DC4</key>
-		<string>../..</string>
-	</dict>
-	<key>IDESourceControlProjectURL</key>
-	<string>ssh://github.com/aaronvegh/SocketRocket.git</string>
-	<key>IDESourceControlProjectVersion</key>
-	<integer>110</integer>
-	<key>IDESourceControlProjectWCCIdentifier</key>
-	<string>82B4653C-9497-408E-B1DC-123266231DC4</string>
-	<key>IDESourceControlProjectWCConfigurations</key>
-	<array>
-		<dict>
-			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
-			<string>public.vcs.git</string>
-			<key>IDESourceControlWCCIdentifierKey</key>
-			<string>82B4653C-9497-408E-B1DC-123266231DC4</string>
-			<key>IDESourceControlWCCName</key>
-			<string>SocketRocket</string>
-		</dict>
-	</array>
-</dict>
-</plist>