git: committed to wrong branch

hydraMax · 04-17-2013, 11:18 PM

Hi. I created a new branch in my project with "git branch game-structure" representing some massive, broken structural changes. I committed the changes, but I forgot to switch to the new branch first, so changes were committed to the master branch. I definitely don't want the changes in the master branch. What is the easiest way to transfer the changes into the new branch?

I haven't published (git push) to our central repo yet, so my mistake is still local to my repo.

mina86 · 04-17-2013, 11:40 PM

Code:

git checkout game-structure
git cherry-pick master
git checkout master
git reset --hard HEAD~

hydraMax · 04-19-2013, 10:13 PM

Thanks!