Skip to content

Instantly share code, notes, and snippets.

@dustinc
Created February 6, 2013 00:12
Show Gist options
  • Save dustinc/4719013 to your computer and use it in GitHub Desktop.
Save dustinc/4719013 to your computer and use it in GitHub Desktop.
git stash save "dirty work" (if you have uncommitted changes)
git pull origin (leave master up to date and this also pulls in the develop branch for you)
git push origin master (if you have committed changes you need to clear up first)
git checkout develop (switch to develop branch)
git branch --set-upstream develop remotes/origin/develop (this will set tracking)
git stash pop stash@{0} (Apply any stashed dirty work to develop -- please hit up the stash man page, there's a couple little things that are tricky to explain)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment