Skip to main content

Git - Removing a file from a commit

Once again, another git magic that might be of help to some of you. This research came up when I accidentally added a couple of unwanted files and wanted to remove them from a commit.

We all know that to update an existing commit, we shall follow this git magic to amend commits. However, how do we drop changes to a particular file in a commit?

While that is easy, it is also tricky. This blog post covers scenarios and respective commands that help you understand what should be done.

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

There are two scenarios to be handled here,

  1. Remove a newly added file
  2. Remove changes to an existing file
Let's look at them separately,

Remove a newly added file

This is the scenario where an unwanted file added to the commit. This file might be some config.json that got generated while doing a research on a new testing tool or a bundling tool. Such scenarios are easier.

1. Remove your file from the local folder

Go to the root folder of your repository and execute the below command,

    > rm config.json

2. Stage and amend the commit

    > git add config.json
    > git commit --amend

Remove changes to an existing file

This is tricky but easy-to-solve scenario once you know it's doable. This is the scenario where there's a file already in the branch and you made some accidental changes to it and committed it. To remove the accidental changes and put it back to what it was before,

1. Checkout the file from the parent branch

Let's say you have made changes to webpack.config.js but don't need that change anymore and let's assume you are working in a branch that was created from an upstream/main branch.

Go to the root folder of your repository and execute the below command,

    > git checkout upstream/main -- webpack.config.js

2. Stage and commit

    > git add config.json
    > git commit --amend

Tada! With this, we come to an end of this git flow. If there's anything that you might want me to add or discuss or if there's anything I've missed, please leave comments below.


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

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,