Advertisement
Guest User

Untitled

a guest
Jul 3rd, 2013
172
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.34 KB | None | 0 0
  1. john@zotac:~$ cd emc-dev
  2. john@zotac:~/emc-dev$ git branch
  3. master
  4. * v2.5_branch
  5. john@zotac:~/emc-dev$ git pull --rebase
  6. remote: Counting objects: 323, done.
  7. remote: Compressing objects: 100% (216/216), done.
  8. remote: Total 226 (delta 169), reused 13 (delta 4)
  9. Receiving objects: 100% (226/226), 90.99 KiB, done.
  10. Resolving deltas: 100% (169/169), completed with 60 local objects.
  11. From ssh://git.linuxcnc.org/git/emc2
  12. * [new branch] contributor-docs-1 -> origin/contributor-docs-1
  13. 102b535..ee0811f master -> origin/master
  14. 27f474a..52ae71f v2.5_branch -> origin/v2.5_branch
  15. First, rewinding head to replay your work on top of it...
  16. Fast-forwarded v2.5_branch to 52ae71fd9a358b554509dec56a4ca6833063b97d.
  17. john@zotac:~/emc-dev$ git gui
  18. john@zotac:~/emc-dev$ git pull --rebase
  19. Current branch v2.5_branch is up to date.
  20. john@zotac:~/emc-dev$ git push
  21. Counting objects: 11, done.
  22. Delta compression using up to 2 threads.
  23. Compressing objects: 100% (6/6), done.
  24. Writing objects: 100% (6/6), 663 bytes, done.
  25. Total 6 (delta 5), reused 0 (delta 0)
  26. Write failed: Broken pipe
  27. fatal: The remote end hung up unexpectedly
  28. error: error in sideband demultiplexer
  29. To ssh://jthornton@git.linuxcnc.org/git/emc2.git
  30. 52ae71f..b538aa7 v2.5_branch -> v2.5_branch
  31. error: failed to push some refs to 'ssh://jthornton@git.linuxcnc.org/git/emc2.git'
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement