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

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

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

Experiments at work

Search This Blog