Skip to main content

Git magic - commit amend

Published on

Like I said already about hard reset, it's a nasty way to alter a commit. Then what is the better way? 

That's exactly what I have written in this post about how we could use amend and what does it do.

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

What is amend in git commit?

In git commit, when you add the attribute --amend like git commit --amend, it lets you edit the most recent commit. 

git commit --amend

So, when you give this command, it opens VIM editor with your latest commit message. Here you can edit your commit message and update it & push.

Is that all?

The answer is no. If you have changes in any of the files and you want to add them to your most recent commit, you can stage those files to commit. Then when you execute the above command, the most recent commit message is shown in the VIM editor or whatever default editor you have along with the newly staged files.

Therefore when you save the commit message from VIM editor, it updates the file changes as well to your most recent commit.

Therefore to sum up, with git commit --amend you can,
  • Update the latest commit message
  • Add / Remove / Modify files from / to the latest commit
I guess that tip helps whenever you have a case where the most recent commit needs to be updated. 
Labels:

Comments

  1. Unknown3 February 2022 at 08:56

    Good Job !!
    Keep writing the blogs, this will really help when you want to avoid multiple commits..

    ReplyDelete

Post a Comment

Popular posts from this blog

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

Git magic - Squash commits

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

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