API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Oct 8th, 2015
149
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 17.11 KB | None | 0 0
raw download clone embed print report
  1. git add src
  2. git add war
  3.  
  4. git commit -m "Another commit to work on scrolling"
  5.  
  6. git pull
  7.  
  8. remote: Counting objects: 31, done.
  9. remote: Compressing objects: 100% (16/16), done.
  10. remote: Total 16 (delta 13), reused 3 (delta 0)
  11. Unpacking objects: 100% (16/16), done.
  12. From github.com:FullCreative/Loop
  13. + 3f00b3f...2e09a49 master -> master (forced update)
  14. Warning: fetch updated the current branch head.
  15. Warning: fast-forwarding your working tree from
  16. Warning: commit 3f00b3f6cb6ed6beddb16baa92f1beaa82b6944c.
  17. Already up-to-date.
  18.  
  19. git push
  20.  
  21. jem@jem-VPCF136FM:~$ cd git
  22. jem@jem-VPCF136FM:~/git$ l
  23. Loop/ Loop-1-18.tar.gz
  24. jem@jem-VPCF136FM:~/git$ cd Loop
  25. jem@jem-VPCF136FM:~/git/Loop$ l
  26. Loop/ README readme.textile
  27. jem@jem-VPCF136FM:~/git/Loop$ l
  28. Loop/ README readme.textile
  29. jem@jem-VPCF136FM:~/git/Loop$ cd Loop
  30. jem@jem-VPCF136FM:~/git/Loop/Loop$ l
  31. src/ war/
  32. jem@jem-VPCF136FM:~/git/Loop/Loop$ git add src
  33. jem@jem-VPCF136FM:~/git/Loop/Loop$ git status
  34. # On branch master
  35. # Changes to be committed:
  36. # (use "git reset HEAD <file>..." to unstage)
  37. #
  38. # modified: src/com/fullcreative/loop/Globals.java
  39. # modified: src/com/fullcreative/loop/LoopController.java
  40. # modified: src/com/fullcreative/loop/LoopDao.java
  41. # modified: src/com/fullcreative/loop/LoopDaoJdo.java
  42. # modified: src/com/fullcreative/loop/LoopService.java
  43. # new file: src/com/fullcreative/loop/TestLoopController.java
  44. #
  45. # Changes not staged for commit:
  46. # (use "git add <file>..." to update what will be committed)
  47. # (use "git checkout -- <file>..." to discard changes in working directory)
  48. #
  49. # modified: war/WEB-INF/LoopDispatcher-servlet.xml
  50. # modified: war/WEB-INF/appengine-web.xml
  51. # modified: war/WEB-INF/applicationContext-security.xml
  52. # modified: war/WEB-INF/html/index.html
  53. # modified: war/WEB-INF/web.xml
  54. # modified: war/js/loop.js
  55. #
  56. # Untracked files:
  57. # (use "git add <file>..." to include in what will be committed)
  58. #
  59. # war/WEB-INF/admin/local-storage.html
  60. jem@jem-VPCF136FM:~/git/Loop/Loop$ git add war
  61. jem@jem-VPCF136FM:~/git/Loop/Loop$ git status
  62. # On branch master
  63. # Changes to be committed:
  64. # (use "git reset HEAD <file>..." to unstage)
  65. #
  66. # modified: src/com/fullcreative/loop/Globals.java
  67. # modified: src/com/fullcreative/loop/LoopController.java
  68. # modified: src/com/fullcreative/loop/LoopDao.java
  69. # modified: src/com/fullcreative/loop/LoopDaoJdo.java
  70. # modified: src/com/fullcreative/loop/LoopService.java
  71. # new file: src/com/fullcreative/loop/TestLoopController.java
  72. # modified: war/WEB-INF/LoopDispatcher-servlet.xml
  73. # new file: war/WEB-INF/admin/local-storage.html
  74. # modified: war/WEB-INF/appengine-web.xml
  75. # modified: war/WEB-INF/applicationContext-security.xml
  76. # modified: war/WEB-INF/html/index.html
  77. # modified: war/WEB-INF/web.xml
  78. # modified: war/js/loop.js
  79. #
  80. jem@jem-VPCF136FM:~/git/Loop/Loop$ git commit -m "Another commit to work on scolling"
  81. [master 3f00b3f] Another commit to work on scolling
  82. 13 files changed, 726 insertions(+), 218 deletions(-)
  83. create mode 100644 Loop/src/com/fullcreative/loop/TestLoopController.java
  84. create mode 100644 Loop/war/WEB-INF/admin/local-storage.html
  85. jem@jem-VPCF136FM:~/git/Loop/Loop$ git pull
  86. remote: Counting objects: 31, done.
  87. remote: Compressing objects: 100% (16/16), done.
  88. remote: Total 16 (delta 13), reused 3 (delta 0)
  89. Unpacking objects: 100% (16/16), done.
  90. From github.com:FullCreative/Loop
  91. + 3f00b3f...2e09a49 master -> master (forced update)
  92. Warning: fetch updated the current branch head.
  93. Warning: fast-forwarding your working tree from
  94. Warning: commit 3f00b3f6cb6ed6beddb16baa92f1beaa82b6944c.
  95. Already up-to-date.
  96. jem@jem-VPCF136FM:~/git/Loop/Loop$ git push
  97. Everything up-to-date
  98. jem@jem-VPCF136FM:~/git/Loop/Loop$ git status
  99. # On branch master
  100. nothing to commit (working directory clean)
  101. jem@jem-VPCF136FM:~/git/Loop/Loop$ git history
  102. git: 'history' is not a git command. See 'git --help'.
  103. jem@jem-VPCF136FM:~/git/Loop/Loop$ git --help
  104. usage: git [--version] [--exec-path[=<path>]] [--html-path]
  105. [-p|--paginate|--no-pager] [--no-replace-objects]
  106. [--bare] [--git-dir=<path>] [--work-tree=<path>]
  107. [-c name=value] [--help]
  108. <command> [<args>]
  109.  
  110. The most commonly used git commands are:
  111. add Add file contents to the index
  112. bisect Find by binary search the change that introduced a bug
  113. branch List, create, or delete branches
  114. checkout Checkout a branch or paths to the working tree
  115. clone Clone a repository into a new directory
  116. commit Record changes to the repository
  117. diff Show changes between commits, commit and working tree, etc
  118. fetch Download objects and refs from another repository
  119. grep Print lines matching a pattern
  120. init Create an empty git repository or reinitialize an existing one
  121. log Show commit logs
  122. merge Join two or more development histories together
  123. mv Move or rename a file, a directory, or a symlink
  124. pull Fetch from and merge with another repository or a local branch
  125. push Update remote refs along with associated objects
  126. rebase Forward-port local commits to the updated upstream head
  127. reset Reset current HEAD to the specified state
  128. rm Remove files from the working tree and from the index
  129. show Show various types of objects
  130. status Show the working tree status
  131. tag Create, list, delete or verify a tag object signed with GPG
  132.  
  133. See 'git help <command>' for more information on a specific command.
  134. jem@jem-VPCF136FM:~/git/Loop/Loop$ git log
  135. commit 2e09a498829e2b12e4bbdff8f8c39c2ce47dacb7
  136. Author: Josh Iwata < josh@fullcreative.com>
  137. Date: Thu Mar 15 14:25:28 2012 -0700
  138.  
  139. Design revamp
  140.  
  141. commit 2927f853041dab06a48861498adc945d6969865a
  142. Author: James Mortensen <james.mortensen@a-cti.com>
  143. Date: Wed Mar 14 09:25:46 2012 -0700
  144.  
  145. Removed Alert.
  146.  
  147. commit 07deceb9cb3cda6b913b2bde96970682ecdbddb7
  148. Author: James Mortensen <james.mortensen@a-cti.com>
  149. Date: Wed Mar 14 09:04:12 2012 -0700
  150.  
  151. Added url pattern to the servlet to get rid of the error.
  152.  
  153. commit f2d48bb735e5c3f1d3cb88ad80483e5596aaa063
  154. Author: James Mortensen <james.mortensen@a-cti.com>
  155. Date: Tue Mar 13 15:44:28 2012 -0700
  156.  
  157. iJames took over again!
  158.  
  159. commit 88fb39c0b37b2dfc5a13e30f212cba525e33f531
  160. Author: David Raffauf <david@fullcreative.com>
  161. Date: Tue Mar 13 15:42:26 2012 -0700
  162.  
  163. I test update
  164.  
  165. commit 5b1af15d166fc766a1a892a13865d9c5be506a6f
  166. Author: Josh Iwata < josh@fullcreative.com>
  167. jem@jem-VPCF136FM:~/git/Loop/Loop$ git status
  168. # On branch master
  169. nothing to commit (working directory clean)
  170. jem@jem-VPCF136FM:~/git/Loop/Loop$ git pull
  171. Already up-to-date.
  172. jem@jem-VPCF136FM:~/git/Loop/Loop$ l
  173. src/ war/
  174. jem@jem-VPCF136FM:~/git/Loop/Loop$ cd src
  175. jem@jem-VPCF136FM:~/git/Loop/Loop/src$ l
  176. cacerts.bin com/ log4j.properties META-INF/
  177. jem@jem-VPCF136FM:~/git/Loop/Loop/src$ cd com
  178. jem@jem-VPCF136FM:~/git/Loop/Loop/src/com$ l
  179. fullcreative/
  180. jem@jem-VPCF136FM:~/git/Loop/Loop/src/com$ cd fullcreative/loop/
  181. jem@jem-VPCF136FM:~/git/Loop/Loop/src/com/fullcreative/loop$ l
  182. AbstractBaseController.java Comment.java LoopController.java PusheableResponse.java
  183. AccountController.java EmailService.java LoopDao.java samples/
  184. Account.java EnvironmentService.java LoopDaoJdo.java security/
  185. AccountService.java FormManagerController.java Loop.java Settings.java
  186. AuthenticatorController.java Globals.java LoopService.java TagSubscription.java
  187. AuthenticatorService.java GoogleCometChannelService.java LoopServlet.java UserDao.java
  188. Cacheable.java HttpRequestHandler.java Memcached.java UserDaoJdo.java
  189. Card.java InvitationDetailsDaoJdo.java OAuth2User.java User.java
  190. CardManagerController.java InvitationDetails.java OAuth2UserService.java
  191. CardTemplateService.java JSONPResponse.java PMF.java
  192. jem@jem-VPCF136FM:~/git/Loop/Loop/src/com/fullcreative/loop$ cd /
  193. jem@jem-VPCF136FM:/$ cd
  194. jem@jem-VPCF136FM:~$ cd workspace
  195. jem@jem-VPCF136FM:~/workspace$ l
  196. ActiveResponseWebService/ ConversionChromeApp.pem GAE Spring Security/ LoopSVN/
  197. Adaptiv3ChatDemo/ ConversionChromeExtension/ GAE Spring Security Demo/ Loop.tar.gz
  198. Adaptiv3ChatDemo-2.zip ConversionSupportChromeApp/ gdata-samples-read-only/ ReverseProxyDemo/
  199. Adaptiv3ChatDemo.zip ConversionSupportLive/ LexLegal/ rhino-for-webapps-demo/
  200. AmazonC3Demo/ ConversionSupportLiveNew/ LexMatter/ SB4.0/
  201. App-AnswerConnect/ ConversionSupportLiveNew2/ local_db.bin SB4.0_branch/
  202. appengine-java-sdk-1.6.2.1/ ConversionSupportLive.zip Loop/ sokolove_lawfirm/
  203. appengine-java-sdk-1.6.2.1.zip Conversion Support- Mobile/ Loop2/ test/
  204. appengine-java-sdk-1.6.3.1/ ConversionSupportWebsite/ Loop-Oauth2-Demo/ Test/
  205. appengine-java-sdk-1.6.3.1.zip ConverstionSupportMobileV1/ LoopRepo/ Thinclient-c3/
  206. AppointmentSchedulingAppGAEJ/ ConverstionSupportMobileV2/ LoopRepo-1-12-2-.tar.gz Thinclient-c3.zip
  207. ChatClientWebservices/ datastore-indexes-auto.xml LoopRepo1-12.tar.gz
  208. ContactManagementSystemDataStore/ EchopassChatClient/ LoopRepo1-13.tar.gz
  209. ConversionChromeApp0.1.1109.6.crx FullTextSearchService/ LoopRepo.tar.gz
  210. jem@jem-VPCF136FM:~/workspace$ cd Loop
  211. jem@jem-VPCF136FM:~/workspace/Loop$ l
  212. Loop/ README readme.textile
  213. jem@jem-VPCF136FM:~/workspace/Loop$ cd Loop
  214. jem@jem-VPCF136FM:~/workspace/Loop/Loop$ l
  215. src/ war/
  216. jem@jem-VPCF136FM:~/workspace/Loop/Loop$ cd src
  217. jem@jem-VPCF136FM:~/workspace/Loop/Loop/src$ l
  218. cacerts.bin com/ log4j.properties META-INF/
  219. jem@jem-VPCF136FM:~/workspace/Loop/Loop/src$ cd com
  220. jem@jem-VPCF136FM:~/workspace/Loop/Loop/src/com$ l
  221. fullcreative/
  222. jem@jem-VPCF136FM:~/workspace/Loop/Loop/src/com$ cd fullcreative/
  223. jem@jem-VPCF136FM:~/workspace/Loop/Loop/src/com/fullcreative$ l
  224. loop/
  225. jem@jem-VPCF136FM:~/workspace/Loop/Loop/src/com/fullcreative$ cd loop
  226. jem@jem-VPCF136FM:~/workspace/Loop/Loop/src/com/fullcreative/loop$
  227. jem@jem-VPCF136FM:~/workspace/Loop/Loop/src/com/fullcreative/loop$ l
  228. AccountController.java Card.java LoopController.java Memcached.java UserDao.java
  229. Account.java Comment.java LoopDao.java OAuth2User.java UserDaoJdo.java
  230. AccountService.java EnvironmentService.java LoopDaoJdo.java OAuth2UserService.java User.java
  231. AuthenticatorController.java HttpRequestHandler.java Loop.java PMF.java
  232. AuthenticatorService.java InvitationDetailsDaoJdo.java LoopService.java samples/
  233. Cacheable.java InvitationDetails.java LoopServlet.java security/
  234. jem@jem-VPCF136FM:~/workspace/Loop/Loop/src/com/fullcreative/loop$ cd ../../../../
  235. jem@jem-VPCF136FM:~/workspace/Loop/Loop$ cd ../../..
  236. jem@jem-VPCF136FM:~$ cd git
  237. jem@jem-VPCF136FM:~/git$ l
  238. Loop/ Loop-1-18.tar.gz
  239. jem@jem-VPCF136FM:~/git$ cd Loop
  240. jem@jem-VPCF136FM:~/git/Loop$ l
  241. Loop/ README readme.textile
  242. jem@jem-VPCF136FM:~/git/Loop$ cd Loop
  243. jem@jem-VPCF136FM:~/git/Loop/Loop$ l
  244. src/ war/
  245. jem@jem-VPCF136FM:~/git/Loop/Loop$
  246.  
  247. git checkout 3f00b3f6cb6ed6beddb16baa92f1beaa82b6944c
  248.  
  249. 3f00b3f HEAD@{0}: checkout: moving from master to 3f00b3f6cb6ed6beddb16baa92f1beaa82b6944c
  250. 2e09a49 HEAD@{1}: checkout: moving from 3f00b3f6cb6ed6beddb16baa92f1beaa82b6944c to master
  251. 3f00b3f HEAD@{2}: checkout: moving from master to 3f00b3f6cb6ed6beddb16baa92f1beaa82b6944c
  252. 2e09a49 HEAD@{3}: pull : forced-update
  253. 3f00b3f HEAD@{4}: commit: Another commit to work on scolling
  254. 2927f85 HEAD@{5}: commit: Removed Alert.
  255. 07deceb HEAD@{6}: commit: Added url pattern to the servlet to get rid of the error.
  256. f2d48bb HEAD@{7}: commit: iJames took over again!
  257. 88fb39c HEAD@{8}: pull : fast-forward
  258. a22893e HEAD@{9}: commit: Committing a very important change to intro.css. Not!
  259. ac19755 HEAD@{10}: pull : fast-forward
  260. d2a401d HEAD@{11}: commit: This is a test
  261. 85a6328 HEAD@{12}: commit: Modified gitignore yet again.
  262. 251f557 HEAD@{13}: commit: Committing the classpath. Hope it works.
  263. 4e7a428 HEAD@{14}: checkout: moving from local_master to master
  264. 97aa2d7 HEAD@{15}: checkout: moving from master to local_master
  265. 4e7a428 HEAD@{16}: commit: Added Admin panel for making system changes. Modified the title and description so they go into edit
  266. 38dc2fa HEAD@{17}: commit: Added notifications and real time comet.
  267. bc2f950 HEAD@{18}: commit: Real time updates and chrome notifications.
  268. bc2f950 HEAD@{19}: commit: Adding TagSubscription class.
  269. 5e696f4 HEAD@{20}: commit: Bulk delete, fixed delete bug, tagging features and subscriptions. Added more server-side caching. Ad
  270. 7b41cc2 HEAD@{21}: commit: adding dropdown plugin files
  271. d9e3716 HEAD@{22}: commit: Added filter list to top, made dynamic, and deployed to 2-20.
  272. e256d21 HEAD@{23}: commit: Cleaned up the HTML code.
  273. d9e3716 HEAD@{24}: commit: Third time is a charm.
  274. 3e0863f HEAD@{25}: commit: Here is the 2nd commit for tag-it.
  275. 13e70c8 HEAD@{26}: commit: Added the tag-it tags to the application and connected to the database.
  276. 0893615 HEAD@{27}: commit: Deployed 2-7 and made default version.
  277. 0073e04 HEAD@{28}: commit: Deployed to 2-7 and made the default version. Finalized mobile form, although the error class shadow
  278. 0073e04 HEAD@{29}: commit: test
  279. 4351a93 HEAD@{30}: commit: Added notifications for comments and cleaned up mobile form.
  280. 5674cfb HEAD@{31}: commit: Added Developer API call to switch users for @loopround.com users.
  281. a22808f HEAD@{32}: commit: updating
  282. 8fa1a39 HEAD@{33}: commit: updating the repository
  283. 8fa1a39 HEAD@{34}: commit: Deployed to http://0-9-2012-1-27.loopaback.appspot.com/
  284. 4786be1 HEAD@{35}: commit: Updating the inbox counts on each loop on page load. Also changed the style of the inbox count on the
  285. 33bf8d5 HEAD@{36}: commit: Adding elastic JS library.
  286. 095d8e6 HEAD@{37}: commit: Hooked up inbox counts and colors on the loops.
  287. d3275ef HEAD@{38}: commit: committing.
  288. a66024c HEAD@{39}: commit: Put in place email notifications for sharing. Put in place more logging statements to catch errors. F
  289. a66024c HEAD@{40}: commit: Fixed sharing settings and cleaned up some of the code. Fixed the invitation system and also added so
  290. e87ca75 HEAD@{41}: commit: Fixed sharing settings and cleaned up some of the code. Fixed the invitation system and also added so
  291. e87ca75 HEAD@{42}: commit: Got rid of login form and also integrated Loop feedback form.
  292. b2d7da9 HEAD@{43}: commit: Eliminated the login page and also integrated the Feedback Loop Form.
  293. b2d7da9 HEAD@{44}: commit: Added the Loop Form.
  294. e7ea0eb HEAD@{45}: commit: Added the Loop Form to the Loop Application and connected it to the services.
  295. e7ea0eb HEAD@{46}: commit: Trying to get all the files for the settings page in the repo.
  296. 97aa2d7 HEAD@{47}: commit: test
  297. 36d4841 HEAD@{48}: commit: Got the settings page in place so users can be added and removed.
  298. cf83cbd HEAD@{49}: commit: Committing this file because I want it to accept changes, not have the repository just simply force m
  299. e7ccb2d HEAD@{50}: commit: Merged Josh's changes, I hope!
  300. 90ee5a5 HEAD@{51}: commit: Merged Josh's changes. Why I have to do this manually, I don't know?
  301. 3fc14b4 HEAD@{52}: commit: Service giving ability to send email to a user.
  302. 2ce4a6c HEAD@{53}: commit: Worked on the UI for adding a user to a Loop. Also fixed the display so it shows all active users ass
  303. 21caa9b HEAD@{54}: commit: Updated the application-manifest.xml file with the new LoopRound name and latest version info.
  304. 4330694 HEAD@{55}: commit: Deployed to http://0-9-2012-1-12-1715.loopaback.appspot.com/# and made the default version. Added in
  305. adde3cd HEAD@{56}: commit: Can now add new loops from the Loop screen. To rename the loop or access it's settings page; currentl
  306. 6902710 HEAD@{57}: commit: Settings page is functional to edit the loop name.
  307. 6980c79 HEAD@{58}: merge branch 'master' of git@github.com:FullCreative/Loop.git: Fast-forward
  308. e364173 HEAD@{59}: commit: Added Josh's CSS to style.css. 2nd attempt.
  309. 0e464f1 HEAD@{60}:
  310.  
  311. [core]
  312. repositoryformatversion = 0
  313. filemode = true
  314. logallrefupdates = true
  315. autocrlf = false
  316. [remote "origin"]
  317. url = git@github.com:FullCreative/Loop.git
  318. fetch = +refs/heads/*:refs/heads/*
  319. push = refs/heads/*:refs/heads/*
  320. [branch "master"]
  321. remote = origin
  322. merge = refs/heads/master
  323.  
  324. From github.com:FullCreative/Loop
  325. + 3f00b3f...2e09a49 master -> master (forced update)
  326. Warning: fetch updated the current branch head.
  327. Warning: fast-forwarding your working tree from
  328. Warning: commit 3f00b3f6cb6ed6beddb16baa92f1beaa82b6944c.
  329.  
  330. [remote "origin"]
  331. url = <some url>
  332. fetch = +refs/heads/*:refs/remotes/origin/*
  333.  
  334. [remote "origin"]
  335. url = <some url>
  336. fetch = +refs/heads/*:refs/heads/*
  337.  
  338. git checkout master; git merge 3f00b3f6cb6ed6beddb16baa92f1beaa82b6944c
  339.  
  340. commit: ################
  341. d511e44dca8c3f7f6f8d3985f3ca54874fb67a63 673fd2fbfc5ad78434389c64565904f81aa9a5ad unknown <###.(none)> 1444281107 -0500 pull --progress I:/####/#####+refs/heads/master:refs/heads/master: forced-update
  342.  
  343. git checkout 673fd2fbfc5ad78434389c64565904f81aa9a5ad
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!