cinderweb

Untitled

Sep 10th, 2013
112
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.48 KB | None | 0 0
  1. 700242a HEAD@{0}: pull: Merge made by the 'recursive' strategy.
  2. 4aefc5b HEAD@{1}: reset: moving to 4aefc5b
  3. 71b87da HEAD@{2}: pull: Merge made by the 'recursive' strategy.
  4. 4e3d757 HEAD@{3}: commit: git reset HEAD world/map/npc/functions/paperboy.txt ->
  5. 15b7bd9 HEAD@{4}: reset: moving to 15b7bd9
  6. 5bb5595 HEAD@{5}: reset: moving to 5bb5595
  7. 1f81ad5 HEAD@{6}: commit (amend): Small indentation fix on NPC Jack
  8. 45e8578 HEAD@{7}: rebase -i (finish): returning to refs/heads/master
  9. 45e8578 HEAD@{8}: rebase -i (fixup): Small indentation fix on NPC Jack
  10. 2f522ca HEAD@{9}: checkout: moving from master to 2f522ca
  11. 5bb5595 HEAD@{10}: rebase -i (finish): returning to refs/heads/master
  12. 5bb5595 HEAD@{11}: rebase -i (squash): Added two new npc's to each of the town s
  13. 15b7bd9 HEAD@{12}: rebase -i (squash): # This is a combination of 2 commits.
  14. 8eaa298 HEAD@{13}: checkout: moving from master to 8eaa298
  15. 4aefc5b HEAD@{14}: rebase: aborting
  16. 8eaa298 HEAD@{15}: checkout: moving from master to 8eaa298
  17. 4aefc5b HEAD@{16}: commit: fixed with just quotes
  18. 9e2d866 HEAD@{17}: commit: edited so it isn't direct speech
  19. 8eaa298 HEAD@{18}: commit (amend): Added two new npc's to each of the town squar
  20. c8d7019 HEAD@{19}: commit (amend): added two new npc's to each of the town swqua
  21. e537cf7 HEAD@{20}: commit (amend): added two new npc's to each of the town swqua
  22. 72d134d HEAD@{21}: rebase -i (finish): returning to refs/heads/master
  23. 72d134d HEAD@{22}: rebase -i (squash): ready for newspaperboys to go i think the
  24. :
Advertisement
Add Comment
Please, Sign In to add comment