Abhishek Somani

About Abhishek Somani

Abhishek is working as a senior java developer in a product start up .He has worked on various java related enterprise applications and frameworks. He loves to explore new technologies

Git : How to add commit in between old commits

I have a Git repository and need to rewrite my local history by inserting a new commit in between old commits.

More specifically my sitatution is like this:
 
 
 
 
 
 
 

AB—BC—CD—EF   MASTER

and I wanted to come up with something like this:

AB—BC—SA—CD—EF   MASTER

Where SA is my new commit i.e to be inserted b/w commit BC & CD.

Well, it isn’t actually an extreme or difficult case.It’s actually a very simple procedure to follow:

$ git checkout master
$ git checkout -b temp BC 
$ git add
$ git commit # your changes that will be SA

Now your Repo will look like this :

AB—BC—SA  temp
      \
      CD—EF MASTER

After this repository layout it’s rather simple to transform it into a single sequence of commits:

$ git rebase temp master

You may get few conflicts that you need to resolve .

Now you are all Done !!!

TAGGING COMMITS

You will notice that your SHA keys are modified and tag doesn’t appear above commit BC to make sure your tags are in line follow the steps:

$ git tag -l #to list all your tags.

For each tag type the following command,

$ git show TAG_NAME

to see the details of the old commit.

Make note of the subject line, date, and hash of the old commit.

Page through git log looking for that subject line and date. Make note of the hash of the new commit when you find it.

$ git tag --force TAG_NAME NEW_COMMIT_HASH #to update the tag.

Hope that you have not mistaken one commit for another with a similar subject line and date.

Thanks to Santosh Mohanty for writing this post .

git-logo
Post Comments And Suggestions !!!

Reference: Git : How to add commit in between old commits from our JCG partner Abhishek Somani at the Java, J2EE, Server blog.
Related Whitepaper:

Software Architecture

This guide will introduce you to the world of Software Architecture!

This 162 page guide will cover topics within the field of software architecture including: software architecture as a solution balancing the concerns of different stakeholders, quality assurance, methods to describe and evaluate architectures, the influence of architecture on reuse, and the life cycle of a system and its architecture. This guide concludes with a comparison between the professions of software architect and software engineer.

Get it Now!  

One Response to "Git : How to add commit in between old commits"

  1. Kanagaraj says:

    Interactive rebase is the right way to go.

Leave a Reply


three − = 2



Java Code Geeks and all content copyright © 2010-2014, Exelixis Media Ltd | Terms of Use | Privacy Policy
All trademarks and registered trademarks appearing on Java Code Geeks are the property of their respective owners.
Java is a trademark or registered trademark of Oracle Corporation in the United States and other countries.
Java Code Geeks is not connected to Oracle Corporation and is not sponsored by Oracle Corporation.

Sign up for our Newsletter

20,709 insiders are already enjoying weekly updates and complimentary whitepapers! Join them now to gain exclusive access to the latest news in the Java world, as well as insights about Android, Scala, Groovy and other related technologies.

As an extra bonus, by joining you will get our brand new e-books, published by Java Code Geeks and their JCG partners for your reading pleasure! Enter your info and stay on top of things,

  • Fresh trends
  • Cases and examples
  • Research and insights
  • Two complimentary e-books