git-handy

Handy git plugin for straightening out a git repo if you've done work on an incorrect branch.

install

sh install.sh

git handy <your new branch name>

git stash
git checkout master
git fetch
git merge
git stash pop