Skip to main content

Git magic - Pushing commits past your latest commit

Published on

It was my first full fledged feature and I was excited to know review comments from my manager. As much as the excitement, the learning that came with taking action on each comment was tremendous and I still can't describe how good I feel about it.

It's one of the times when I thought Git to be, "Wow! what an invention!!"

Although I had some code refactors, most of the comments were to split my single commit into several different commits for the sake of CI picking them up.

I thought, it's simple. I can amend my previous commit to remove files from existing commit and make them part of new commits. That's where trouble came up. I cannot remove a dependency and try to use it assuming I will have that as part of an upcoming commit. 

I definitely will have to go back in time to push a commit. At first I thought, I'll change my latest commit to be a dependency commit and create new commit for feature. However that involved a lot of manual work which would defeat the purpose of git itself in the first place. I had to come up with some different trick and as usual I went in search. My search phrases went as, 

  1. create commits in between
  2. push a commit before latest commit
  3. alter commit history to add commit
and so on. I gathered information from a number of stack overflow answers and finally came up with the following method. 

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

So the steps involved are as follows,

  1. Execute git log
  2. Copy the commit hash after which you have to push a new commit
  3. Do a git checkout <copied_commit_hash>. For instance, git checkout 54ace3456ka235rtyc90
  4. After that, your head is pointing to the mentioned commit hash. 
  5. Now, make any change and do the required commit(s)
  6. Once you are done with all your commits, you will have to rebase with the below mentioned command,
    git rebase --onto HEAD <copied_commit_hash> <your_working_branch>

    For instance,
    git rebase --onto HEAD 54ace3456ka235rtyc90 working/my-new-feat
  7. Now, all the commits you made after the checkout will be showing past your top most commit. You could verify that by executing git log.
Tada! Although git would show exact time when each commit was made, (i.e) although chronologically your most recent commit is actually older, the commit history would show it exactly where you wanted it to show. I will further dig & write about pushing commits in between few of the commits sooner. I hope this helps you get through. 

Labels:

Comments

  1. Unknown3 February 2022 at 08:58

    Git is like Time travel, whatever you want you can achieve. Thanks for sharing this blog..

    ReplyDelete

Post a Comment

Popular posts from this blog

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

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

npm-link | What NPM won't tell you!

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