Home » Software Development » Git : How to add commit in between old commits

About Abhishek Somani

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.

Do you want to know how to develop your skillset to become a Java Rockstar?

Subscribe to our newsletter to start Rocking right now!

To get you started we give you our best selling eBooks for FREE!

1. JPA Mini Book

2. JVM Troubleshooting Guide

3. JUnit Tutorial for Unit Testing

4. Java Annotations Tutorial

5. Java Interview Questions

6. Spring Interview Questions

7. Android UI Design

and many more ....

 

One comment

  1. Interactive rebase is the right way to go.

Leave a Reply

Your email address will not be published. Required fields are marked *

*


four − 3 =

You may use these HTML tags and attributes: <a href="" title=""> <abbr title=""> <acronym title=""> <b> <blockquote cite=""> <cite> <code> <del datetime=""> <em> <i> <q cite=""> <s> <strike> <strong>

Want to take your Java Skills to the next level?
Grab our programming books for FREE!
  • Save time by leveraging our field-tested solutions to common problems.
  • The books cover a wide range of topics, from JPA and JUnit, to JMeter and Android.
  • Each book comes as a standalone guide (with source code provided), so that you use it as reference.
Last Step ...

Where should we send the free eBooks?

Good Work!
To download the books, please verify your email address by following the instructions found on the email we just sent you.