Guest User

Untitled

a guest
May 26th, 2018
181
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 2.01 KB | None | 0 0
  1. $ git pull origin usbmaster --dry-run
  2. remote: Counting objects: 27, done.
  3. remote: Compressing objects: 100% (24/24), done.
  4. remote: Total 25 (delta 8), reused 0 (delta 0)
  5. Unpacking objects: 100% (25/25), done.
  6. From github.com:karlp/karlnet
  7. * branch usbmaster -> FETCH_HEAD
  8. There are no candidates for merging among the refs that you just fetched.
  9. Generally this means that you provided a wildcard refspec which had no
  10. matches on the remote end.
  11.  
  12. and now, 5 seconds later...
  13.  
  14.  
  15. $ git pull origin usbmaster
  16. From github.com:karlp/karlnet
  17. * branch usbmaster -> FETCH_HEAD
  18. Removing consumers/simple_web/README
  19. Merge made by recursive.
  20. consumers/simple_web/README | 2 -
  21. consumers/web/README | 1 +
  22. consumers/web/common/jquery.flot.js | 2119 ++++++++++++++++++++
  23. consumers/{simple_web => web/common}/stomp.js | 73 +-
  24. consumers/web/simple_graph/README | 12 +
  25. consumers/web/simple_graph/index.html | 127 ++
  26. .../{simple_web => web/simple_graph}/karlnet.js | 0
  27. consumers/web/simple_graph/screenshot-rough.png | Bin 0 -> 48470 bytes
  28. consumers/web/simple_table/README | 7 +
  29. .../{simple_web => web/simple_table}/index.html | 2 +-
  30. .../{simple_web => web/simple_table}/karlnet.js | 0
  31. 11 files changed, 2306 insertions(+), 37 deletions(-)
  32. delete mode 100644 consumers/simple_web/README
  33. create mode 100644 consumers/web/README
  34. create mode 100644 consumers/web/common/jquery.flot.js
  35. rename consumers/{simple_web => web/common}/stomp.js (71%)
  36. create mode 100644 consumers/web/simple_graph/README
  37. create mode 100644 consumers/web/simple_graph/index.html
  38. copy consumers/{simple_web => web/simple_graph}/karlnet.js (100%)
  39. create mode 100755 consumers/web/simple_graph/screenshot-rough.png
  40. create mode 100644 consumers/web/simple_table/README
  41. rename consumers/{simple_web => web/simple_table}/index.html (91%)
  42. rename consumers/{simple_web => web/simple_table}/karlnet.js (100%)
Add Comment
Please, Sign In to add comment