Rebase a single Git commit

git rebase
Kevin Meyer picture Kevin Meyer · Jan 31, 2013 · Viewed 75.3k times · Source

Is there a way to rebase a single commit from a branch onto another branch?

I have this branch structure:

-- -- -- -- -- (Master)
            \
              -- -- -- -- -- XX (Feature-branch)

All I want to do is to rebase the last commit of Feature-branch onto master and rollback Feature-branch one commit. 

-- -- -- -- -- XX (Master)
            \
              -- -- -- -- -- (Feature-branch)

How do I do that?

Answer

tewe picture tewe · Jan 31, 2013

You can cherry-pick XX to master.

git checkout master
git cherry-pick <commit ID of XX>

And remove the last commit from the feature branch with git reset.

git checkout Feature-branch
git reset --hard HEAD^

Related questions

Squash my last X commits together using Git

How can I squash my last X commits together into one commit using Git?

Read More
Git refusing to merge unrelated histories on rebase

During git rebase origin/development the following error message is shown from Git: fatal: refusing to merge unrelated histories Error redoing merge 1234deadbeef1234deadbeef My Git version is 2.9.0. It used to work fine in the previous version. How can I …

Read More
Undoing a git rebase

Does anybody know how to easily undo a git rebase? The only way that comes to mind is to go at it manually: git checkout the commit parent to both of the branches then create a temp branch from there …

Read More