Skip to content

Instantly share code, notes, and snippets.

@deepakprasanna
Created September 12, 2011 03:00
Show Gist options
  • Save deepakprasanna/1210495 to your computer and use it in GitHub Desktop.
Save deepakprasanna/1210495 to your computer and use it in GitHub Desktop.
shikeb@psi:~/rails$ git stash list <--- Nothing in the stash location.
shikeb@psi:~/rails$ git stash
Saved working directory and index state WIP on master: 95fdaf9 Merge branch 'master' of github.com:lifo/docrails
HEAD is now at 95fdaf9 Merge branch 'master' of github.com:lifo/docrails
shikeb@psi:~/rails$ git stash list
stash@{0}: WIP on master: 95fdaf9 Merge branch 'master' of github.com:lifo/docrails <--- State of the index has been stashed.
shikeb@psi:~/rails$ git status
# On branch master
# Your branch is ahead of 'origin/master' by 130 commits.
#
nothing to commit (working directory clean)
shikeb@psi:~/rails$
shikeb@psi:~/rails$ git pull origin master <--- Pull the changes like a boss.
From https://github.com/rails/rails
* branch master -> FETCH_HEAD
Updating 95fdaf9..4bcacc8
Fast-forward
.../lib/active_record/railties/databases.rake | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment