moving committed (but not pushed) changes to a new branch after pull

Question

I\'ve done a fair bit of work (\"Your branch is ahead of \'origin/master\' by 37 commits.\") which really should have gone into its own branch rather than into master<

Answer 1

What about:

1. Branch from the current HEAD.
2. Make sure you are on master, not your new branch.
3. git reset back to the last commit before you started making changes.
4. git pull to re-pull just the remote changes you threw away with the reset.

Or will that explode when you try to re-merge the branch?