API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Nov 19th, 2015
112
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 23.66 KB | None | 0 0
raw download clone embed print report
  1. Last login: Thu Nov 19 15:38:34 on ttys004
  2. AdminisatorsAir:~ MUKR1$ cd /Users/MUKR1/Documents/xcode/TradingPost
  3. AdminisatorsAir:TradingPost MUKR1$ git
  4. usage: git [--version] [--help] [-C <path>] [-c name=value]
  5. [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]
  6. [-p|--paginate|--no-pager] [--no-replace-objects] [--bare]
  7. [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]
  8. <command> [<args>]
  9.  
  10. The most commonly used git commands are:
  11. add Add file contents to the index
  12. bisect Find by binary search the change that introduced a bug
  13. branch List, create, or delete branches
  14. checkout Checkout a branch or paths to the working tree
  15. clone Clone a repository into a new directory
  16. commit Record changes to the repository
  17. diff Show changes between commits, commit and working tree, etc
  18. fetch Download objects and refs from another repository
  19. grep Print lines matching a pattern
  20. init Create an empty Git repository or reinitialize an existing one
  21. log Show commit logs
  22. merge Join two or more development histories together
  23. mv Move or rename a file, a directory, or a symlink
  24. pull Fetch from and integrate with another repository or a local branch
  25. push Update remote refs along with associated objects
  26. rebase Forward-port local commits to the updated upstream head
  27. reset Reset current HEAD to the specified state
  28. rm Remove files from the working tree and from the index
  29. show Show various types of objects
  30. status Show the working tree status
  31. tag Create, list, delete or verify a tag object signed with GPG
  32.  
  33. 'git help -a' and 'git help -g' list available subcommands and some
  34. concept guides. See 'git help <command>' or 'git help <concept>'
  35. to read about a specific subcommand or concept.
  36. AdminisatorsAir:TradingPost MUKR1$ git tag old-origin-master origin/master
  37. AdminisatorsAir:TradingPost MUKR1$ git tag old-master master
  38. AdminisatorsAir:TradingPost MUKR1$ cd desktop
  39. -bash: cd: desktop: No such file or directory
  40. AdminisatorsAir:TradingPost MUKR1$ cd ~/Desktop
  41. AdminisatorsAir:Desktop MUKR1$ git tag old-master master
  42. fatal: Not a git repository (or any of the parent directories): .git
  43. AdminisatorsAir:Desktop MUKR1$ cd /Users/MUKR1/Documents/xcode/TradingPost
  44. AdminisatorsAir:TradingPost MUKR1$ git fetch
  45. remote: Counting objects: 39, done.
  46. remote: Total 39 (delta 7), reused 7 (delta 7), pack-reused 32
  47. Unpacking objects: 100% (39/39), done.
  48. From https://github.com/JamEngulfer/TradingPost
  49. + a770d2c...587f105 master -> origin/master (forced update)
  50. AdminisatorsAir:TradingPost MUKR1$ git rebase --onto origin/master old-origin-master old-master
  51. Cannot rebase: You have unstaged changes.
  52. Please commit or stash them.
  53. AdminisatorsAir:TradingPost MUKR1$ git stash
  54. Saved working directory and index state WIP on master: 5075845 Some file Xcode wants me to upload
  55. HEAD is now at 5075845 Some file Xcode wants me to upload
  56. AdminisatorsAir:TradingPost MUKR1$ git rebase --onto origin/master old-origin-master old-master
  57. First, rewinding head to replay your work on top of it...
  58. Applying: Updated some stuff, idk
  59. Applying: Added support for a height offset. Removed unneeded code
  60. Applying: Disabled AppearanceHandler's functionality for now because of performance issues.
  61. Applying: Added a warning if the code is running on the main thread. Also removed old code
  62. Applying: Added method to get total cache size and removed old method code.
  63. Applying: Added heuristic check code that should greatly reduce the amount of duplicate image save operations. Changed name generation code to be more efficient and only use the image's signature instead of full name so multiple items can use the same image. Added method to get total size of the image cache
  64. Applying: Added method to get an item from a JSON dictionary
  65. Applying: Put all Core Data handling into a utilities class.
  66. Applying: Removed unnecessary code
  67. Applying: Removed old code. Added a label to show total amount of items
  68. Applying: Removed night mode switch temporarily because the functionality is unfinished.
  69. Applying: Removed log message when a tab is pressed.
  70. Applying: Added in [super viewWillAppear:animated] and added a space to a method name
  71. Applying: Added save delegate
  72. Applying: Added iOS 8 view presentation and cleaned up the code
  73. Applying: Added a delegate to call when a save is successful
  74. Applying: Cleaned up code. Fully implemented saving an item in folders
  75. Applying: Added view to create new folders in groups
  76. Applying: Added UIAlertDelegate
  77. Applying: Cleaned up code. Added showing size of image cache to the purge cache button
  78. Applying: Cleaned up code. Added the ability to create new folders and groups
  79. Applying: Made it so that you can't delete a group unless you have upgraded the app
  80. Applying: Cleaned up code. Offloaded item data processing to ItemUtils class. Implemented coloured label to show amount of items currently available.
  81. Applying: Update NSManagedObject classes
  82. Applying: Cleaned up code. Now disabled Google Analytics if the app is in debug mode
  83. Applying: Offloaded Core Data code into DataHandler class. Offloaded item JSON data processing to ItemUtils. Added accordingly coloured label to show total amount of items available. Added code to make cells align with whether they should be hidden. Cleaned up code.
  84. Applying: Created new data model with proper relationships. Also contains groups.
  85. Applying: Added storyboards for all new view. Fixed constraints on a lot of views too.
  86. Applying: Debug breakpoints? idk.
  87. Using index info to reconstruct a base tree...
  88. M TradingPost.xcdatamodeld/.xccurrentversion
  89. Falling back to patching base and 3-way merge...
  90. Applying: Some file Xcode wants me to upload
  91. AdminisatorsAir:TradingPost MUKR1$ git log
  92. commit 0dc5190d6abda253c37623ba8c8a13206ff26db1
  93. Author: JamEngulfer <dan_m@btinternet.com>
  94. Date: Thu Nov 19 16:02:40 2015 +0000
  95.  
  96. Some file Xcode wants me to upload
  97.  
  98. commit 0fda36c28f1e243a79d310fe0f90635dd59875f8
  99. Author: JamEngulfer <dan_m@btinternet.com>
  100. Date: Thu Nov 19 16:02:22 2015 +0000
  101.  
  102. Debug breakpoints? idk.
  103.  
  104. commit 104dd42fd12361c4c5dde9164037107d84bca2f2
  105. Author: JamEngulfer <dan_m@btinternet.com>
  106. Date: Thu Nov 19 16:01:18 2015 +0000
  107.  
  108. Added storyboards for all new view. Fixed constraints on a lot of views too.
  109.  
  110. commit 4f4ee217a159e3bc21759e6ede702dba4ca44ab9
  111. Author: JamEngulfer <dan_m@btinternet.com>
  112. Date: Thu Nov 19 15:59:58 2015 +0000
  113.  
  114. Created new data model with proper relationships. Also contains groups.
  115. :
  116. commit 0dc5190d6abda253c37623ba8c8a13206ff26db1
  117. Author: JamEngulfer <dan_m@btinternet.com>
  118. Date: Thu Nov 19 16:02:40 2015 +0000
  119.  
  120. Some file Xcode wants me to upload
  121.  
  122. commit 0fda36c28f1e243a79d310fe0f90635dd59875f8
  123. Author: JamEngulfer <dan_m@btinternet.com>
  124. Date: Thu Nov 19 16:02:22 2015 +0000
  125.  
  126. Debug breakpoints? idk.
  127.  
  128. commit 104dd42fd12361c4c5dde9164037107d84bca2f2
  129. Author: JamEngulfer <dan_m@btinternet.com>
  130. Date: Thu Nov 19 16:01:18 2015 +0000
  131.  
  132. Added storyboards for all new view. Fixed constraints on a lot of views too.
  133.  
  134. commit 4f4ee217a159e3bc21759e6ede702dba4ca44ab9
  135. Author: JamEngulfer <dan_m@btinternet.com>
  136. Date: Thu Nov 19 15:59:58 2015 +0000
  137.  
  138. Created new data model with proper relationships. Also contains groups.
  139.  
  140. commit 80be4f5c98ca04e5da22e4069940ed1db15b1366
  141. Author: JamEngulfer <dan_m@btinternet.com>
  142. Date: Thu Nov 19 15:54:09 2015 +0000
  143.  
  144. Offloaded Core Data code into DataHandler class. Offloaded item JSON data pr:
  145. commit 0dc5190d6abda253c37623ba8c8a13206ff26db1
  146. Author: JamEngulfer <dan_m@btinternet.com>
  147. Date: Thu Nov 19 16:02:40 2015 +0000
  148.  
  149. Some file Xcode wants me to upload
  150.  
  151. commit 0fda36c28f1e243a79d310fe0f90635dd59875f8
  152. Author: JamEngulfer <dan_m@btinternet.com>
  153. Date: Thu Nov 19 16:02:22 2015 +0000
  154.  
  155. Debug breakpoints? idk.
  156.  
  157. commit 104dd42fd12361c4c5dde9164037107d84bca2f2
  158. Author: JamEngulfer <dan_m@btinternet.com>
  159. Date: Thu Nov 19 16:01:18 2015 +0000
  160.  
  161. Added storyboards for all new view. Fixed constraints on a lot of views too.
  162.  
  163. commit 4f4ee217a159e3bc21759e6ede702dba4ca44ab9
  164. Author: JamEngulfer <dan_m@btinternet.com>
  165. Date: Thu Nov 19 15:59:58 2015 +0000
  166.  
  167. Created new data model with proper relationships. Also contains groups.
  168.  
  169. commit 80be4f5c98ca04e5da22e4069940ed1db15b1366
  170. Author: JamEngulfer <dan_m@btinternet.com>
  171. Date: Thu Nov 19 15:54:09 2015 +0000
  172.  
  173. Offloaded Core Data code into DataHandler class. Offloaded item JSON data processing to ItemUtils. Added accordingly coloured label to show total amount of items available. Added code to make cells align with whether they should be hidden. Cleaned up code.
  174.  
  175. commit 333ae4f57fc5c0f2bfbd3ecfe6fc249cd705f657
  176. Author: JamEngulfer <dan_m@btinternet.com>
  177. Date: Thu Nov 19 15:51:43 2015 +0000
  178.  
  179. :
  180. commit 0dc5190d6abda253c37623ba8c8a13206ff26db1
  181. Author: JamEngulfer <dan_m@btinternet.com>
  182. Date: Thu Nov 19 16:02:40 2015 +0000
  183.  
  184. Some file Xcode wants me to upload
  185.  
  186. commit 0fda36c28f1e243a79d310fe0f90635dd59875f8
  187. Author: JamEngulfer <dan_m@btinternet.com>
  188. Date: Thu Nov 19 16:02:22 2015 +0000
  189.  
  190. Debug breakpoints? idk.
  191.  
  192. commit 104dd42fd12361c4c5dde9164037107d84bca2f2
  193. Author: JamEngulfer <dan_m@btinternet.com>
  194. Date: Thu Nov 19 16:01:18 2015 +0000
  195.  
  196. Added storyboards for all new view. Fixed constraints on a lot of views too.
  197.  
  198. commit 4f4ee217a159e3bc21759e6ede702dba4ca44ab9
  199. Author: JamEngulfer <dan_m@btinternet.com>
  200. Date: Thu Nov 19 15:59:58 2015 +0000
  201.  
  202. Created new data model with proper relationships. Also contains groups.
  203.  
  204. commit 80be4f5c98ca04e5da22e4069940ed1db15b1366
  205. Author: JamEngulfer <dan_m@btinternet.com>
  206. Date: Thu Nov 19 15:54:09 2015 +0000
  207.  
  208. Offloaded Core Data code into DataHandler class. Offloaded item JSON data processing to ItemUtils. Added accordingly coloured label to show total amount of items available. Added code to make cells align with whether they should be hidden. Cleaned up code.
  209.  
  210. commit 333ae4f57fc5c0f2bfbd3ecfe6fc249cd705f657
  211. Author: JamEngulfer <dan_m@btinternet.com>
  212. Date: Thu Nov 19 15:51:43 2015 +0000
  213.  
  214. Cleaned up code. Now disabled Google Analytics if the app is in debug mode
  215. :
  216. commit 0dc5190d6abda253c37623ba8c8a13206ff26db1
  217. Author: JamEngulfer <dan_m@btinternet.com>
  218. Date: Thu Nov 19 16:02:40 2015 +0000
  219.  
  220. Some file Xcode wants me to upload
  221.  
  222. commit 0fda36c28f1e243a79d310fe0f90635dd59875f8
  223. Author: JamEngulfer <dan_m@btinternet.com>
  224. Date: Thu Nov 19 16:02:22 2015 +0000
  225.  
  226. Debug breakpoints? idk.
  227.  
  228. commit 104dd42fd12361c4c5dde9164037107d84bca2f2
  229. Author: JamEngulfer <dan_m@btinternet.com>
  230. Date: Thu Nov 19 16:01:18 2015 +0000
  231.  
  232. Added storyboards for all new view. Fixed constraints on a lot of views too.
  233.  
  234. commit 4f4ee217a159e3bc21759e6ede702dba4ca44ab9
  235. Author: JamEngulfer <dan_m@btinternet.com>
  236. Date: Thu Nov 19 15:59:58 2015 +0000
  237.  
  238. Created new data model with proper relationships. Also contains groups.
  239.  
  240. commit 80be4f5c98ca04e5da22e4069940ed1db15b1366
  241. Author: JamEngulfer <dan_m@btinternet.com>
  242. Date: Thu Nov 19 15:54:09 2015 +0000
  243.  
  244. Offloaded Core Data code into DataHandler class. Offloaded item JSON data processing to ItemUtils. Added accordingly coloured label to show total amount of items available. Added code to make cells align with whether they should be hidden. Cleaned up code.
  245.  
  246. commit 333ae4f57fc5c0f2bfbd3ecfe6fc249cd705f657
  247. Author: JamEngulfer <dan_m@btinternet.com>
  248. Date: Thu Nov 19 15:51:43 2015 +0000
  249.  
  250. Cleaned up code. Now disabled Google Analytics if the app is in debug mode
  251.  
  252. :
  253. commit 0dc5190d6abda253c37623ba8c8a13206ff26db1
  254. Author: JamEngulfer <dan_m@btinternet.com>
  255. Date: Thu Nov 19 16:02:40 2015 +0000
  256.  
  257. Some file Xcode wants me to upload
  258.  
  259. commit 0fda36c28f1e243a79d310fe0f90635dd59875f8
  260. Author: JamEngulfer <dan_m@btinternet.com>
  261. Date: Thu Nov 19 16:02:22 2015 +0000
  262.  
  263. Debug breakpoints? idk.
  264.  
  265. commit 104dd42fd12361c4c5dde9164037107d84bca2f2
  266. Author: JamEngulfer <dan_m@btinternet.com>
  267. Date: Thu Nov 19 16:01:18 2015 +0000
  268.  
  269. Added storyboards for all new view. Fixed constraints on a lot of views too.
  270.  
  271. commit 4f4ee217a159e3bc21759e6ede702dba4ca44ab9
  272. Author: JamEngulfer <dan_m@btinternet.com>
  273. Date: Thu Nov 19 15:59:58 2015 +0000
  274.  
  275. Created new data model with proper relationships. Also contains groups.
  276.  
  277. commit 80be4f5c98ca04e5da22e4069940ed1db15b1366
  278. Author: JamEngulfer <dan_m@btinternet.com>
  279. Date: Thu Nov 19 15:54:09 2015 +0000
  280.  
  281. Offloaded Core Data code into DataHandler class. Offloaded item JSON data processing to ItemUtils. Added accordingly coloured label to show total amount of items available. Added code to make cells align with whether they should be hidden. Cleaned up code.
  282.  
  283. commit 333ae4f57fc5c0f2bfbd3ecfe6fc249cd705f657
  284. Author: JamEngulfer <dan_m@btinternet.com>
  285. Date: Thu Nov 19 15:51:43 2015 +0000
  286.  
  287. Cleaned up code. Now disabled Google Analytics if the app is in debug mode
  288.  
  289. commit 69563cc8968d8c2478310d14916e09948a0b427c
  290. :
  291. commit 0dc5190d6abda253c37623ba8c8a13206ff26db1
  292. Author: JamEngulfer <dan_m@btinternet.com>
  293. Date: Thu Nov 19 16:02:40 2015 +0000
  294.  
  295. Some file Xcode wants me to upload
  296.  
  297. commit 0fda36c28f1e243a79d310fe0f90635dd59875f8
  298. Author: JamEngulfer <dan_m@btinternet.com>
  299. Date: Thu Nov 19 16:02:22 2015 +0000
  300.  
  301. Debug breakpoints? idk.
  302.  
  303. commit 104dd42fd12361c4c5dde9164037107d84bca2f2
  304. Author: JamEngulfer <dan_m@btinternet.com>
  305. Date: Thu Nov 19 16:01:18 2015 +0000
  306.  
  307. Added storyboards for all new view. Fixed constraints on a lot of views too.
  308.  
  309. commit 4f4ee217a159e3bc21759e6ede702dba4ca44ab9
  310. Author: JamEngulfer <dan_m@btinternet.com>
  311. Date: Thu Nov 19 15:59:58 2015 +0000
  312.  
  313. Created new data model with proper relationships. Also contains groups.
  314.  
  315. commit 80be4f5c98ca04e5da22e4069940ed1db15b1366
  316. Author: JamEngulfer <dan_m@btinternet.com>
  317. Date: Thu Nov 19 15:54:09 2015 +0000
  318.  
  319. Offloaded Core Data code into DataHandler class. Offloaded item JSON data processing to ItemUtils. Added accordingly coloured label to show total amount of items available. Added code to make cells align with whether they should be hidden. Cleaned up code.
  320.  
  321. commit 333ae4f57fc5c0f2bfbd3ecfe6fc249cd705f657
  322. Author: JamEngulfer <dan_m@btinternet.com>
  323. Date: Thu Nov 19 15:51:43 2015 +0000
  324.  
  325. Cleaned up code. Now disabled Google Analytics if the app is in debug mode
  326.  
  327. commit 69563cc8968d8c2478310d14916e09948a0b427c
  328. Author: JamEngulfer <dan_m@btinternet.com>
  329. :
  330. commit 0dc5190d6abda253c37623ba8c8a13206ff26db1
  331. Author: JamEngulfer <dan_m@btinternet.com>
  332. Date: Thu Nov 19 16:02:40 2015 +0000
  333.  
  334. Some file Xcode wants me to upload
  335.  
  336. commit 0fda36c28f1e243a79d310fe0f90635dd59875f8
  337. Author: JamEngulfer <dan_m@btinternet.com>
  338. Date: Thu Nov 19 16:02:22 2015 +0000
  339.  
  340. Debug breakpoints? idk.
  341.  
  342. commit 104dd42fd12361c4c5dde9164037107d84bca2f2
  343. Author: JamEngulfer <dan_m@btinternet.com>
  344. Date: Thu Nov 19 16:01:18 2015 +0000
  345.  
  346. Added storyboards for all new view. Fixed constraints on a lot of views too.
  347.  
  348. commit 4f4ee217a159e3bc21759e6ede702dba4ca44ab9
  349. Author: JamEngulfer <dan_m@btinternet.com>
  350. Date: Thu Nov 19 15:59:58 2015 +0000
  351.  
  352. Created new data model with proper relationships. Also contains groups.
  353.  
  354. commit 80be4f5c98ca04e5da22e4069940ed1db15b1366
  355. Author: JamEngulfer <dan_m@btinternet.com>
  356. Date: Thu Nov 19 15:54:09 2015 +0000
  357.  
  358. Offloaded Core Data code into DataHandler class. Offloaded item JSON data processing to ItemUtils. Added accordingly coloured label to show total amount of items available. Added code to make cells align with whether they should be hidden. Cleaned up code.
  359.  
  360. commit 333ae4f57fc5c0f2bfbd3ecfe6fc249cd705f657
  361. Author: JamEngulfer <dan_m@btinternet.com>
  362. Date: Thu Nov 19 15:51:43 2015 +0000
  363.  
  364. Cleaned up code. Now disabled Google Analytics if the app is in debug mode
  365.  
  366. commit 69563cc8968d8c2478310d14916e09948a0b427c
  367. Author: JamEngulfer <dan_m@btinternet.com>
  368. Date: Thu Nov 19 15:51:08 2015 +0000
  369.  
  370. Update NSManagedObject classes
  371. :
  372. commit 0dc5190d6abda253c37623ba8c8a13206ff26db1
  373. Author: JamEngulfer <dan_m@btinternet.com>
  374. Date: Thu Nov 19 16:02:40 2015 +0000
  375.  
  376. Some file Xcode wants me to upload
  377.  
  378. commit 0fda36c28f1e243a79d310fe0f90635dd59875f8
  379. Author: JamEngulfer <dan_m@btinternet.com>
  380. Date: Thu Nov 19 16:02:22 2015 +0000
  381.  
  382. Debug breakpoints? idk.
  383.  
  384. commit 104dd42fd12361c4c5dde9164037107d84bca2f2
  385. Author: JamEngulfer <dan_m@btinternet.com>
  386. Date: Thu Nov 19 16:01:18 2015 +0000
  387.  
  388. Added storyboards for all new view. Fixed constraints on a lot of views too.
  389.  
  390. commit 4f4ee217a159e3bc21759e6ede702dba4ca44ab9
  391. Author: JamEngulfer <dan_m@btinternet.com>
  392. Date: Thu Nov 19 15:59:58 2015 +0000
  393.  
  394. Created new data model with proper relationships. Also contains groups.
  395.  
  396. commit 80be4f5c98ca04e5da22e4069940ed1db15b1366
  397. Author: JamEngulfer <dan_m@btinternet.com>
  398. Date: Thu Nov 19 15:54:09 2015 +0000
  399.  
  400. Offloaded Core Data code into DataHandler class. Offloaded item JSON data processing to ItemUtils. Added accordingly coloured label to show total amount of items available. Added code to make cells align with whether they should be hidden. Cleaned up code.
  401.  
  402. commit 333ae4f57fc5c0f2bfbd3ecfe6fc249cd705f657
  403. Author: JamEngulfer <dan_m@btinternet.com>
  404. Date: Thu Nov 19 15:51:43 2015 +0000
  405.  
  406. Cleaned up code. Now disabled Google Analytics if the app is in debug mode
  407.  
  408. commit 69563cc8968d8c2478310d14916e09948a0b427c
  409. Author: JamEngulfer <dan_m@btinternet.com>
  410. Date: Thu Nov 19 15:51:08 2015 +0000
  411.  
  412. Update NSManagedObject classes
  413.  
  414. commit b7f25df5702c1465fe07e119ada8c5c2d9770a71
  415. :
  416. commit 0dc5190d6abda253c37623ba8c8a13206ff26db1
  417. Author: JamEngulfer <dan_m@btinternet.com>
  418. Date: Thu Nov 19 16:02:40 2015 +0000
  419.  
  420. Some file Xcode wants me to upload
  421.  
  422. commit 0fda36c28f1e243a79d310fe0f90635dd59875f8
  423. Author: JamEngulfer <dan_m@btinternet.com>
  424. Date: Thu Nov 19 16:02:22 2015 +0000
  425.  
  426. Debug breakpoints? idk.
  427.  
  428. commit 104dd42fd12361c4c5dde9164037107d84bca2f2
  429. Author: JamEngulfer <dan_m@btinternet.com>
  430. Date: Thu Nov 19 16:01:18 2015 +0000
  431.  
  432. Added storyboards for all new view. Fixed constraints on a lot of views too.
  433.  
  434. commit 4f4ee217a159e3bc21759e6ede702dba4ca44ab9
  435. Author: JamEngulfer <dan_m@btinternet.com>
  436. Date: Thu Nov 19 15:59:58 2015 +0000
  437.  
  438. Created new data model with proper relationships. Also contains groups.
  439.  
  440. commit 80be4f5c98ca04e5da22e4069940ed1db15b1366
  441. Author: JamEngulfer <dan_m@btinternet.com>
  442. Date: Thu Nov 19 15:54:09 2015 +0000
  443.  
  444. Offloaded Core Data code into DataHandler class. Offloaded item JSON data processing to ItemUtils. Added accordingly coloured label to show total amount of items available. Added code to make cells align with whether they should be hidden. Cleaned up code.
  445.  
  446. commit 333ae4f57fc5c0f2bfbd3ecfe6fc249cd705f657
  447. Author: JamEngulfer <dan_m@btinternet.com>
  448. Date: Thu Nov 19 15:51:43 2015 +0000
  449.  
  450. Cleaned up code. Now disabled Google Analytics if the app is in debug mode
  451.  
  452. commit 69563cc8968d8c2478310d14916e09948a0b427c
  453. Author: JamEngulfer <dan_m@btinternet.com>
  454. Date: Thu Nov 19 15:51:08 2015 +0000
  455.  
  456. Update NSManagedObject classes
  457.  
  458. commit b7f25df5702c1465fe07e119ada8c5c2d9770a71
  459. Author: JamEngulfer <dan_m@btinternet.com>
  460.  
  461. [1]+ Stopped git log
  462. AdminisatorsAir:TradingPost MUKR1$ git stash apply
  463. error: Your local changes to the following files would be overwritten by merge:
  464. TradingPost.xcworkspace/xcuserdata/MUKR1.xcuserdatad/UserInterfaceState.xcuserstate
  465. Please, commit your changes or stash them before you can merge.
  466. Aborting
  467. AdminisatorsAir:TradingPost MUKR1$ git status
  468. Not currently on any branch.
  469. Changes not staged for commit:
  470. (use "git add <file>..." to update what will be committed)
  471. (use "git checkout -- <file>..." to discard changes in working directory)
  472.  
  473. modified: TradingPost.xcworkspace/xcuserdata/MUKR1.xcuserdatad/UserInterfaceState.xcuserstate
  474.  
  475. Untracked files:
  476. (use "git add <file>..." to include in what will be committed)
  477.  
  478. .DS_Store
  479. Effects/.DS_Store
  480. Effects/UIImageEffects/.DS_Store
  481. Effects/UIImageEffects/UIImageEffects.xcodeproj/xcuserdata/
  482. Effects/UIImageEffects/UIImageEffects/.DS_Store
  483. Images/.DS_Store
  484. Podfile.lock
  485. Pods/.DS_Store
  486. Pods/AFNetworking/UIKit+AFNetworking/UIImage+AFNetworking.h
  487. Pods/Headers/
  488. Pods/InAppSettingsKit/
  489. Pods/Manifest.lock
  490. Pods/OpenSSL/LICENSE
  491. Pods/OpenSSL/README
  492. Pods/OpenSSL/README.ASN1
  493. Pods/OpenSSL/README.ENGINE
  494. Pods/OpenSSL/opensslIncludes/
  495. Pods/Pods.xcodeproj/xcuserdata/MUKR1.xcuserdatad/
  496. Pods/RMStore/LICENSE
  497. Pods/RMStore/README.md
  498. Pods/RMStore/RMStore/RMStore.h
  499. Pods/RMStore/RMStore/RMStore.m
  500. Pods/Reachability/
  501. Pods/Target Support Files/
  502. Pods/iRate/
  503. TradingPost/.DS_Store
  504. TradingPost/Images.xcassets/.DS_Store
  505.  
  506. no changes added to commit (use "git add" and/or "git commit -a")
  507. AdminisatorsAir:TradingPost MUKR1$ git checkout -- TradingPost.xcworkspace/xcuserdata/MUKR1.xcuserdatad/UserInterfaceState.xcuserstate
  508. AdminisatorsAir:TradingPost MUKR1$ git stash apply
  509. Not currently on any branch.
  510. Changes not staged for commit:
  511. (use "git add <file>..." to update what will be committed)
  512. (use "git checkout -- <file>..." to discard changes in working directory)
  513.  
  514. modified: TradingPost.xcworkspace/xcuserdata/MUKR1.xcuserdatad/UserInterfaceState.xcuserstate
  515.  
  516. Untracked files:
  517. (use "git add <file>..." to include in what will be committed)
  518.  
  519. .DS_Store
  520. Effects/.DS_Store
  521. Effects/UIImageEffects/.DS_Store
  522. Effects/UIImageEffects/UIImageEffects.xcodeproj/xcuserdata/
  523. Effects/UIImageEffects/UIImageEffects/.DS_Store
  524. Images/.DS_Store
  525. Podfile.lock
  526. Pods/.DS_Store
  527. Pods/AFNetworking/UIKit+AFNetworking/UIImage+AFNetworking.h
  528. Pods/Headers/
  529. Pods/InAppSettingsKit/
  530. Pods/Manifest.lock
  531. Pods/OpenSSL/LICENSE
  532. Pods/OpenSSL/README
  533. Pods/OpenSSL/README.ASN1
  534. Pods/OpenSSL/README.ENGINE
  535. Pods/OpenSSL/opensslIncludes/
  536. Pods/Pods.xcodeproj/xcuserdata/MUKR1.xcuserdatad/
  537. Pods/RMStore/LICENSE
  538. Pods/RMStore/README.md
  539. Pods/RMStore/RMStore/RMStore.h
  540. Pods/RMStore/RMStore/RMStore.m
  541. Pods/Reachability/
  542. Pods/Target Support Files/
  543. Pods/iRate/
  544. TradingPost/.DS_Store
  545. TradingPost/Images.xcassets/.DS_Store
  546.  
  547. no changes added to commit (use "git add" and/or "git commit -a")
  548. AdminisatorsAir:TradingPost MUKR1$ git checkout -- TradingPost.xcworkspace/xcuserdata/MUKR1.xcuserdatad/UserInterfaceState.xcuserstate
  549. AdminisatorsAir:TradingPost MUKR1$ git stash apply
  550. Not currently on any branch.
  551. Changes not staged for commit:
  552. (use "git add <file>..." to update what will be committed)
  553. (use "git checkout -- <file>..." to discard changes in working directory)
  554.  
  555. modified: TradingPost.xcworkspace/xcuserdata/MUKR1.xcuserdatad/UserInterfaceState.xcuserstate
  556.  
  557. Untracked files:
  558. (use "git add <file>..." to include in what will be committed)
  559.  
  560. .DS_Store
  561. Effects/.DS_Store
  562. Effects/UIImageEffects/.DS_Store
  563. Effects/UIImageEffects/UIImageEffects.xcodeproj/xcuserdata/
  564. Effects/UIImageEffects/UIImageEffects/.DS_Store
  565. Images/.DS_Store
  566. Podfile.lock
  567. Pods/.DS_Store
  568. Pods/AFNetworking/UIKit+AFNetworking/UIImage+AFNetworking.h
  569. Pods/Headers/
  570. Pods/InAppSettingsKit/
  571. Pods/Manifest.lock
  572. Pods/OpenSSL/LICENSE
  573. Pods/OpenSSL/README
  574. Pods/OpenSSL/README.ASN1
  575. Pods/OpenSSL/README.ENGINE
  576. Pods/OpenSSL/opensslIncludes/
  577. Pods/Pods.xcodeproj/xcuserdata/MUKR1.xcuserdatad/
  578. Pods/RMStore/LICENSE
  579. Pods/RMStore/README.md
  580. Pods/RMStore/RMStore/RMStore.h
  581. Pods/RMStore/RMStore/RMStore.m
  582. Pods/Reachability/
  583. Pods/Target Support Files/
  584. Pods/iRate/
  585. TradingPost/.DS_Store
  586. TradingPost/Images.xcassets/.DS_Store
  587.  
  588. no changes added to commit (use "git add" and/or "git commit -a")
  589. AdminisatorsAir:TradingPost MUKR1$ git checkout -- TradingPost.xcworkspace/xcuserdata/MUKR1.xcuserdatad/UserInterfaceState.xcuserstate
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!