Git - Move Recent Commits To A Branch
Today I will show you how to perform the following change to your git repository:
You may need to do this if you created a new branch, but forgot to switch to it before subsequently making your commits to master instead.
If You Haven't Yet Pushed
Run the following commands
# Create the branch you want the changes in. git branch myNewBranch # Move master back by 3 commits git reset --hard HEAD~3 # Switch to this new branch git checkout myNewBranch
If Already Pushed
# Create the branch you want the changes in. git branch myNewBranch git push -u origin myNewBranch # Move master back by 3 commits git reset --hard HEAD~3 # Force to push these steps to the remote server # (and apologize to all the other developers in your team). git push --force origin # Switch to this new branch git checkout myNewBranch
Extra Steps For Gitlab Users
If you are using Github, the previous command should have succeeded and your all done. In my case, because I am resetting master on a Gitlab server, this was rejected with the following message:
! [rejected] master -> master (non-fast-forward) error: failed to push some refs to 'email@example.com:Page/package-xxx-xx.git' hint: Updates were rejected because the tip of your current branch is behind hint: its remote counterpart. Integrate the remote changes (e.g. hint: 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details.
This was easy enough to fix. Master branches are marked as "protected" by default. Simply unprotect them before running your force push again and then re-protect the branch.