Git - How to drop a commit in history?

Back after a while with another git magic. We already have seen how to get rid of the top most commit in this article -> Git magic - Make commits disappear

First of all, it's one of the not so recommended way of doing it and more than that, it can only get rid of sequential commits from latest. I recently happened to get into a scenario where I had to drop a commit in the history by keeping the latest ones. As part of that exploration, presenting you this article.

/**
* @disclaimer
* Please read this post fully before executing any command. My scenario might not be same as yours.
*/

To my greatest surprise, I didn't know a git rebase could do this. Please continue to read to know how. The steps are simple,

Count until the commit line you need to drop using git log
Do an interactive rebase and you're done.

Let me explain step by step.

1. Look at the commit log & count commits

This is the first step. First let's list the commits using the following command,

> git log --oneline

In the above commit list, let's say, I want to drop the following commit,

f1be775 build: add wctr to mocha exclude and webpack include

It's 4th commit from the top and since we are dropping that commit, let's take the count as 5.

2. Do an interactive rebase

This is the last and final step where we will do an interactive rebase to drop a commit from the history.

> git rebase -i HEAD~5

In the command, the option -i indicates interactive rebase. Vim or any other assigned editor opens with the above content and if you carefully see, the chosen 5 commits are shown in the reverse order.

Now carefully decide what are all the commits you need to drop and change the command from pick to drop in the editor you see, like below.

Save and close the editor. At this point, you might get into situations where conflicts happen because of the commits you dropped.

At that point,

Resolve conflicts
Stage the changed files
Do a git rebase --continue

Do this until you get a Successful rebase message and you're all done. Now, the commits that you mentioned drop in the interactive rebase would have gone from the history.

Being that said, with so much commands in the interactive rebase like reword, edit, squash, fixup it's a pure magic and we'll see about each one of them in the upcoming articles.

Comments

Git magic - Squash commits

Back with another git magic. When it comes to merging a pull request on Github, there are two options Rebase and Merge Squash and Merge What is Rebase and Merge? When one chooses Rebase and Merge, all the commits in the PR are added to the target branch. For example, if the PR has 5 commits, all of those commits will be visible in the PR history of the target branch. What is Squash and Merge? When a PR is merged by choosing Squash and Merge, all the commits in the PR are combined into one PR and then added to the target branch. Once again, if the PR has 5 commits or any number of commits, they are combined and added to the target branch. Therefore, this is what Squash means. Combining 'n' different commits into one single commit is called squashing. In this blog post, we will go through the commands that can squash commits. Advantages of Squashing commits No more redundant commits In a pull request, one may have 'n' different commits for one change. They might have bee...

Confluence: 5 quick things that you need

As part of my work experiments, this week I would like to write down the things that one needs to know in confluence that can up-skill their documentation works. I will cover the following 5 things, How to Anchor link a title? How to Anchor link to a section? How to create a dashing dashboard? Panel - Confluence Macro Layouts - Confluence Tools Content by Label - Confluence Macro 1. How to Anchor link a title? This is the most required thing. Most useful when one has to refer to a section internally on the same confluence page. Let's consider you have a page with three different sections and titles as shown below, In this, if you want to add an internal anchor from a text in paragraph 3 to a title in paragraph 1, you can add it as follows, Choose the word that needs Anchor Click on the link icon from the Toolbar above In the link box, enter #Page Title 1 Click Insert That is it. Your anchor from the selected text to Page Title 1 is ready. This can be tested out in the preview itsel...

npm-link | What NPM won't tell you!

Hello readers. So back with another easy yet unexplored feature of npm/yarn packages. We as frontend developers / SDK developers, have to deal with more than one repositories where we actually code contribute. Most SDK developers would know this already or they use the not-so-well documented 'npm link' command . /** * @disclaimer * Please read this post fully before executing any command. My scenario might not be the same as yours. * This article below uses a repo from my current workplace as an example which is open-source and does not violate the Cisco Confidentiality Policies */ To make this article easier to understand, some representations, Host - Package that needs another local package as part of its node modules. Let's assume the path to this package is ~/Documents/Repos/demo-app Adhoc - Local package that is added into another package as a dependency. Let's assume the path to this package is ~/Documents/Repos/semver-monorepo What is...

Experiments at work

Search This Blog