Skip to main content

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,

  1. Count until the commit line you need to drop using git log
  2. 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,

  1. Resolve conflicts
  2. Stage the changed files
  3. 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

Popular posts from this blog

WebRTC - What the heck?

Over the past few weeks, I happened to work on stuff that enabled me to understand what WebRTC is and how useful it is.  The full form? Web R eal- T ime C ommunication The history It's first release was by 2011. If you want to know more, well, please read the wikipedia . WebRTC  has been a boon to web developers who want to build streaming applications or video calling applications. As you move downward, you'll just may be understand how WebRTC works but nothing technicals.  The story Let's begin with a short story. Long long ago, so long ago, nobody knew how long ago, there lived two shop keeper farmers John & Finch. It was that old point in time when barter system was a thing and money wasn't invented.  These shopkeepers lived in different cities across a river and the cities were connected by a rock solid bridge. Like how the golden gate connects the San Francisco city and the Marin County. Finch is a very private person and takes hard time to trust people. John

TDD - How to go about it? - A quick start example

So, it's only recently I've been doing TDD. I have written unit tests before but those were all tests after writing the actual code. Confusing statement right? /**  * @disclaimer  * I'm just preaching what I practice and some parts of it could be wrong.  * Please feel free to leave comments if am wrong  * And I would be happy to stand corrected */ What is TDD? TDD, expanded as Test Driven Development could have this statement as one of the definitions. "TDD is nothing but the art of writing down the business use case one by one and write code based on it paralelly" It would feel like why do I need to write test for that? We could do the same with pen & paper and write codes. But then, you again circle back to write tests for the same. So why not do it this way?  Therefore, let's start with an example, Write a method that accepts two positive numbers as input and returns their sum Let's try and do a mock TDD for the above problem.  Case 1 - Function add

Git magic - Make commits disappear

So fellas, it's been a while since I wrote and I hope this article is of help to whoever reads this.  Let's start with bit of an introduction. Until my previous employment, there wasn't much guideline on how we write Github's commit message. One single feature could have n number of commits and it doesn't bother the repository.  Now, am part of  @webex 's  webex-js-sdk  team where committing guidelines are very strict and having a bit more deep knowledge of git commands has become essential. This made me explore git commands on regular basis. So I thought why keep them to myself while I can share them. It was my first ever PR and my changes were approved except for a few minor changes. I honestly didn't know how to make changes to existing commit and now, I had two choices.  Create a new branch from master and re-do the work manually Do some git magic and make the current branch work well.  If it were old times, I'd have gone with option 1. It's very