Skip to content

Instantly share code, notes, and snippets.

@karlp
Created May 21, 2010 01:53
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save karlp/408366 to your computer and use it in GitHub Desktop.
Save karlp/408366 to your computer and use it in GitHub Desktop.
$ git pull origin usbmaster --dry-run
remote: Counting objects: 27, done.
remote: Compressing objects: 100% (24/24), done.
remote: Total 25 (delta 8), reused 0 (delta 0)
Unpacking objects: 100% (25/25), done.
From github.com:karlp/karlnet
* branch usbmaster -> FETCH_HEAD
There are no candidates for merging among the refs that you just fetched.
Generally this means that you provided a wildcard refspec which had no
matches on the remote end.
and now, 5 seconds later...
$ git pull origin usbmaster
From github.com:karlp/karlnet
* branch usbmaster -> FETCH_HEAD
Removing consumers/simple_web/README
Merge made by recursive.
consumers/simple_web/README | 2 -
consumers/web/README | 1 +
consumers/web/common/jquery.flot.js | 2119 ++++++++++++++++++++
consumers/{simple_web => web/common}/stomp.js | 73 +-
consumers/web/simple_graph/README | 12 +
consumers/web/simple_graph/index.html | 127 ++
.../{simple_web => web/simple_graph}/karlnet.js | 0
consumers/web/simple_graph/screenshot-rough.png | Bin 0 -> 48470 bytes
consumers/web/simple_table/README | 7 +
.../{simple_web => web/simple_table}/index.html | 2 +-
.../{simple_web => web/simple_table}/karlnet.js | 0
11 files changed, 2306 insertions(+), 37 deletions(-)
delete mode 100644 consumers/simple_web/README
create mode 100644 consumers/web/README
create mode 100644 consumers/web/common/jquery.flot.js
rename consumers/{simple_web => web/common}/stomp.js (71%)
create mode 100644 consumers/web/simple_graph/README
create mode 100644 consumers/web/simple_graph/index.html
copy consumers/{simple_web => web/simple_graph}/karlnet.js (100%)
create mode 100755 consumers/web/simple_graph/screenshot-rough.png
create mode 100644 consumers/web/simple_table/README
rename consumers/{simple_web => web/simple_table}/index.html (91%)
rename consumers/{simple_web => web/simple_table}/karlnet.js (100%)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment