cinderweb

Untitled

Sep 10th, 2013
79
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.88 KB | None | 0 0
  1. jason@jason-AY597AA-ABA-HPE-110f:~$ cd ~/Downloads/tmwa-server-data/
  2. jason@jason-AY597AA-ABA-HPE-110f:~/Downloads/tmwa-server-data$ git commit
  3. # On branch master
  4. # Your branch is ahead of 'origin/master' by 6 commits.
  5. # (use "git push" to publish your local commits)
  6. #
  7. nothing to commit, working directory clean
  8. jason@jason-AY597AA-ABA-HPE-110f:~/Downloads/tmwa-server-data$ git push
  9. Username for 'https://github.com': cinderweb
  10. Password for 'https://[email protected]':
  11. Counting objects: 40, done.
  12. Delta compression using up to 4 threads.
  13. Compressing objects: 100% (28/28), done.
  14. Writing objects: 100% (28/28), 3.36 KiB, done.
  15. Total 28 (delta 18), reused 4 (delta 0)
  16. To https://github.com/cinderweb/tmwa-server-data.git
  17. 1f81ad5..700242a master -> master
  18. jason@jason-AY597AA-ABA-HPE-110f:~/Downloads/tmwa-server-data$ git log
  19. commit 700242a53bc6e9083f9709fa6a5c8a89c5a82c0e
  20. Merge: 4aefc5b 1f81ad5
  21. Author: cinderweb <[email protected]>
  22. Date: Tue Sep 10 15:27:35 2013 -0500
  23.  
  24. Merge branch 'master' of https://github.com/cinderweb/tmwa-server-data
  25. git pull to see what it does to my system and to even things out
  26.  
  27. commit 1f81ad5f9ce142c36693b0cd3199779ad3487f15
  28. Author: Dino Paskvan <[email protected]>
  29. Date: Thu Aug 29 15:03:22 2013 +0200
  30.  
  31. Small indentation fix on NPC Jack
  32.  
  33. commit 4aefc5b153b5f8d18617832c3a3fdb79ff2d14cd
  34. Author: cinderweb <[email protected]>
  35. Date: Tue Sep 10 12:54:55 2013 -0500
  36.  
  37. fixed with just quotes
  38.  
  39. commit 9e2d866232ed424fe3a8f15384ea583df0faf443
  40. Author: cinderweb <[email protected]>
  41. Date: Tue Sep 10 12:49:25 2013 -0500
  42.  
  43. edited so it isn't direct speech
  44.  
  45. commit 8eaa29829cda23d08ac65f7318204abc37c51595
  46. Author: cinderweb <[email protected]>
  47. Date: Wed Sep 4 17:24:28 2013 -0500
  48.  
  49. Added two new npc's to each of the town square to sell bi-weekly newspapers.
  50.  
  51. commit 715daeb50afd6c0d6f822bf8bd2821677e3c41a5
  52. :
Advertisement
Add Comment
Please, Sign In to add comment