cinderweb

Untitled

Oct 23rd, 2013
78
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 2.47 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 status
  3. # On branch news-titles
  4. # Changes not staged for commit:
  5. # (use "git add/rm <file>..." to update what will be committed)
  6. # (use "git checkout -- <file>..." to discard changes in working directory)
  7. #
  8. # modified: world/map/news.d/09-winter2012.txt
  9. # deleted: world/map/news.d/10-news-news.txt
  10. # deleted: world/map/news.d/11-CR-Jan13.txt
  11. # deleted: world/map/news.d/12-manaplus.txt
  12. # deleted: world/map/news.d/13-lpc.txt
  13. # deleted: world/map/news.d/14-bugfix-killthegmevent.txt
  14. # deleted: world/map/news.d/15-servermove.txt
  15. # deleted: world/map/news.d/16-servermoveagain.txt
  16. # deleted: world/map/news.d/17-beanie-easter.txt
  17. # deleted: world/map/news.d/18-bugfixes.txt
  18. # deleted: world/map/news.d/19-rollbackup.txt
  19. # deleted: world/map/news.d/20-double-exp-drop.txt
  20. # deleted: world/map/news.d/21-tulimshar-caves.txt
  21. # deleted: world/map/news.d/22-orum-extension.txt
  22. # deleted: world/map/news.d/23-astral-extension.txt
  23. # deleted: world/map/news.d/24-code-release.txt
  24. #
  25. # Untracked files:
  26. # (use "git add <file>..." to include in what will be committed)
  27. #
  28. # world/map/news.d/10-news-news.txt~
  29. # world/map/news.d/11-CR-Jan13.txt~
  30. # world/map/news.d/12-manaplus.txt~
  31. # world/map/news.d/13-lpc.txt~
  32. # world/map/news.d/14-bugfix-killthegmevent.txt~
  33. # world/map/news.d/15-servermove.txt~
  34. # world/map/news.d/16-servermoveagain.txt~
  35. # world/map/news.d/17-beanie-easter.txt~
  36. # world/map/news.d/18-bugfixes.txt~
  37. # world/map/news.d/19-rollbackup.txt~
  38. # world/map/news.d/20-double-exp-drop.txt~
  39. # world/map/news.d/21-tulimshar-caves.txt~
  40. # world/map/news.d/22-orum-extension.txt~
  41. # world/map/news.d/23-astral-extension.txt~
  42. # world/map/news.d/23.txt
  43. # world/map/news.d/24-code-release.txt~
  44. no changes added to commit (use "git add" and/or "git commit -a")
  45. jason@jason-AY597AA-ABA-HPE-110f:~/Downloads/tmwa-server-data$ git checkout world
  46. jason@jason-AY597AA-ABA-HPE-110f:~/Downloads/tmwa-server-data$ git rebase -i
  47. There is no tracking information for the current branch.
  48. Please specify which branch you want to rebase against.
  49. See git-rebase(1) for details
  50.  
  51. git rebase <branch>
  52.  
  53. If you wish to set tracking information for this branch you can do so with:
  54.  
  55. git branch --set-upstream-to=<remote>/<branch> news-titles
  56.  
  57. jason@jason-AY597AA-ABA-HPE-110f:~/Downloads/tmwa-server-data$
Advertisement
Add Comment
Please, Sign In to add comment