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 simple. However in this case, the PR was approved already. I wasn't ready to go over the approval once again. Therefore, I went in search of how to do the magic.

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

I wanted something like git revert that doesn't add a new commit. So this is when I found my first ever weapon.

git reset --hard

This command simply rolls back to one of the commits in the history making all commits from that one to the most recent disappear.

So, the steps goes as,

Backup your changes
Do git log
Scroll down to the commit until which you want to remove the history.
Copy it's commit hash and execute the following command -> git reset --hard <copied_commit_hash>
For instance, git reset --hard 54ace3456ka235rtyc90

This will place your head at the mentioned commit hash. Now you can manually paste your changes in the respective files either from your backup or from git GUI (github, bitbucket, gitlab etc.,) and commit it. Once done you could do a force push as indicated here -> git push --force.

Such a nasty way to update a commit right? I couldn't agree more. But this helps in cases when you mess up rebase and a lot of commit from upstream/master shows up in your commit history.

If this is not a recommended way, then what is? Please head over to my next article -> Git magic - commit amend.

Comments

Git worktree - guide to flexible folder structure

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...

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...

Building AI Apps - The basics you need to know

So you want to build an AI assistant? Maybe for customer support, maybe to search through documents, or maybe just to automate some boring stuff at work. You keep hearing words like "prompting", "RAG", "fine-tuning" thrown around in meetings. But what do they actually mean and which one do you need? Let me walk you through building a customer support AI assistant and show you how each of these concepts fits in. /** * @disclaimer * This is an educational post based on my learnings. * I'll share actual experiments in future posts. * Your use case might be different, so take what applies to you. */ What even is an LLM? Before we jump into the techniques, let's start with the basics. What is an LLM? Think of a Large Language Model (LLM) as someone who has read most of the internet but has zero memory of your conversation once it ends. Models like GPT-4, Claude, or Llama have been trained on massive amounts of text data. They know a lot...

Experiments at work

Search This Blog