Rebase a single Git commit

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?

Solution 1:

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^

Solution 2:

git rebase --onto master branch~1 branch 

This says "rebase the range of commits between last-before-branch and branch (that is, XX commit) on the tip of master branch"

After this operation branch tip is moved on commit XX, so you want to set it back with

git checkout branch
git reset --hard branch@{1}^

Which says "reset the branch tip to the commit before its previous state"

So a cherry pick is a simpler solution...

Solution 3:

It's pretty simple to do actually. The solution is to do an interactive rebase and "drop" all of the commits you don't want to include in the rebase.

git rebase -i <target_branch> where target_branch is the branch you want to rebase on to

Then you will edit the file that is opened and pick the commits you do want and drop (or d for short) all the commits you don't want to bring along.