Setup

The initial state is that you are on the main branch.

alina

And you push 2 extra commits.

alina

Then, you realize that the 2 commits, 2318ae and 0330f1, should not be on the main branch but on a separate branch named fix.

Solution description

There are multiple ways to fix this situation, but the simplest solution is described here.

Note: This solution assumes that you have not yet pushed those commits to the origin server. If you have, there would be some extra steps required to properly fix the situation.

You want those 2 extra commits to be on the branch fix, so we start by creating that branch.

Once done, your commit tree looks like this:

alina

The tree shows:

• The branch fix is OK: it has the 3 commits you have created so far.
• The branch main is not OK: it has the last 2 commits that you don’t want there.

To get rid of those 2 commits, use the git reset HEAD{2}--hard command while you are on the main branch.

The syntax HEAD{2} means 2 commits before the current HEAD position.

As HEAD is currently the main branch, that command will drop those 2 commits from the main branch.

This command allows you to time travel to the state you were in before those 2 commits were created.

alina

All those commits modified a file named file.txt, and you can check its content to confirm that everything is as expected.

If you switch to the fix branch, you will see the 2 extra changes made by the 2 commits.

Problem solved.