Skip to content

Instantly share code, notes, and snippets.

@kiwiswift
Forked from tonylukasavage/script.sh
Created April 24, 2018 04:43
Show Gist options
  • Select an option

  • Save kiwiswift/73d6d36c9ec99a0b24ec758f2db2f2a1 to your computer and use it in GitHub Desktop.

Select an option

Save kiwiswift/73d6d36c9ec99a0b24ec758f2db2f2a1 to your computer and use it in GitHub Desktop.
Move all uncommitted changes to a new branch and revert the existing branch to HEAD. "master" has uncommitted changes. You decided you'd rather make those changes in "dev_branch". Here's how to move those uncommitted changes to "dev_branch" and then revert "master" to its last commit.
# get into the master branch
git checkout master
# create a new branch for the changes and check it out
git checkout -b dev_branch
# stash the changes until we revert master
git stash
# go back to master
git checkout master
# reset to the last commit
git reset --hard HEAD
# go back to dev_branch
git checkout dev_branch
# re-apply the stashed changes and you are good to go
git stash apply
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment