How do I insert a commit using git?

Question

I need to insert a commit in the master branch of my git repository whist preserving the subsequent merges and commits.

I currently have something like this

A--B--C--D--E--F     master
       \     \  
        G--H  I--J   branches

and need to insert a commit K such that the new structure becomes

A--B--K              master
    \
     C--D--E--F      new branch
      \     \  
       G--H  I--J    old branches

I'm not even sure if this is possible. Any ideas?

Daniel Fanjul · Accepted Answer · 2009-05-06 16:25:00Z

9

git checkout master
git branch new_branch # copy current branch master to new_branch
git reset --hard B    # now master points to B
(hack, hack, hack)
git commit -m K       # K on B in master

answered May 6, 2009 at 16:25

Daniel Fanjul

3,5014 gold badges29 silver badges29 bronze badges

Sign up to request clarification or add additional context in comments.

Comments

Esko Luontola · Accepted Answer · 2009-05-06 14:13:30Z

2

Rename the "master" branch to "new branch". Then checkout the commit B, start a new branch called "master" from there, and make your changes. Something like follows should do it (not tested).

git branch -m master new_branch
git branch master B
git checkout master

edited May 6, 2009 at 14:13

answered May 6, 2009 at 14:06

Esko Luontola

73.8k17 gold badges119 silver badges129 bronze badges

2 Comments

Jason Over a year ago

Thank you for your answer. This results in commit A being a member of "new branch" and not "master". The history for master then becomes "B--K" rather than the intended "A--B--K". This same structure could be achieved (with differing branch names) by simply branching from B and committing K.

13ren Over a year ago

@Jason I know I'm 4 years late to the party here, and your account seems to be gone; but commit A would be a member of both "new_branch" and "master". It is a tree, and many branches can share the same ancestors. Of course, it might be notated one way or the other (e.g. by git log --graph --oneline --all), but that's just a notation - git log master and git log new_branch will show both have A. It's also true of your suggestion for creating this same structure.

Bombe · Accepted Answer · 2009-05-06 15:25:12Z

0

# git checkout -b new-master B

Now make your changes for K, commit them and voilá, there’s the structure you want. :)

answered May 6, 2009 at 15:25

Bombe

84.4k20 gold badges127 silver badges127 bronze badges

Collectives™ on Stack Overflow

How do I insert a commit using git?

3 Answers 3

Comments

2 Comments

Comments

Your Answer

Hot Network Questions

Collectives™ on Stack Overflow

3 Answers 3

Comments

2 Comments

Comments

Your Answer

Sign up or log in

Post as a guest

Related