Skip to main content

Git - Removing a file from a commit

Published on

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.

/**
 * @disclaimer
 * 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.

Labels:

Comments

Post a Comment

Popular posts from this blog

Git worktree - guide to flexible folder structure

Published on
As always, let's start with a story why I have written this one down. I have been using git for almost 5 years now and in one of my work places I had to work on the same project but different features in parallel.  Switching between branches back and forth was a costly operation given that I didn't discover commit amend until recently. Even though I'd have discovered commit amend, I'd still have did this. Still did what? I can sense that question deep from your throats. So, whenever I am in a situation to work on multiple features or a feature and a bug fix, I'd have two clones of my repo each with different branches, Whenever a feature is merged or the fixes are merged, I'll delete the clone in my machine and branch in my origin (Gitlab / Github etc.,) Recently when I started writing these git articles, my manager suggested me to learn about Git Worktree and it'll be useful. And when I got free and good understanding of git commit, rebase and stuff, I decid
Post a Comment
Read more

Confluence: 5 quick things that you need

Published on
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
Post a Comment
Read more