Skip to content

Instantly share code, notes, and snippets.

@till
Created March 9, 2016 18:08
Show Gist options
  • Save till/541bd97504920267f66b to your computer and use it in GitHub Desktop.
Save till/541bd97504920267f66b to your computer and use it in GitHub Desktop.
till:easybib-cookbooks/ (r/academy) $ git checkout master [18:05:58]
Switched to branch 'master'
Your branch is up-to-date with 'origin/master'.
till:easybib-cookbooks/ (master) $ git pull [19:07:16]
remote: Counting objects: 2, done.
remote: Compressing objects: 100% (2/2), done.
remote: Total 2 (delta 0), reused 0 (delta 0), pack-reused 0
Unpacking objects: 100% (2/2), done.
From github.com:till/easybib-cookbooks
147b897..bcfccde master -> origin/master
* [new ref] refs/pull/937/head -> origin/pr/937
* [new ref] refs/pull/938/head -> origin/pr/938
* [new branch] T/refactor-nginx-app-configure -> origin/T/refactor-nginx-app-configure
* [new branch] T/remove-nginxapp-configure -> origin/T/remove-nginxapp-configure
Updating 147b897..bcfccde
Fast-forward
easybib/providers/supervisor.rb | 5 +++--
ies/recipes/role-undeploy.rb | 5 ++++-
2 files changed, 7 insertions(+), 3 deletions(-)
till:easybib-cookbooks/ (master) $ git checkout r/academy [19:07:22]
Switched to branch 'r/academy'
till:easybib-cookbooks/ (r/academy) $ git rebase master [19:07:30]
First, rewinding head to replay your work on top of it...
Applying: Update: delete old code
till:easybib-cookbooks/ (r/academy) $ git push -f origin r/academy [19:07:35]
Counting objects: 2, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (2/2), done.
Writing objects: 100% (2/2), 247 bytes | 0 bytes/s, done.
Total 2 (delta 1), reused 0 (delta 0)
To [email protected]:till/easybib-cookbooks.git
+ a5a6d78...b3b2956 r/academy -> r/academy (forced update)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment