Git - 压缩早期提交并在不同的分支上反映它

Question

I'm fairly new to Git and I'm trying to squash a series of earlier commits, but I'm having problems having this 'squashing' reflect on all branches.

I started with the following tree:

A---->B---->C---->D---->E---->F---->G---->H (Branch 1)
                                          \
                                           \
                                            \
                                             I---->J---->K (Branch 2)

I want to 'squash' commits C, D, E and F, but I want this 'squashing' to be reflected on both Branches 1 and 2.

I tried 'git rebase -i HEAD~7' and did the necessary changes (while on Branch 1), but this is what I ended with:

A---->B---->C'---->G---->H (Branch 1)
      \
       \
        \
         C---->D---->E---->F---->G---->H---->I---->J---->K (Branch 2)

When what I wanted to get was:

A---->B---->C'---->G---->H (Branch 1)
                          \
                           \
                            \
                             I---->J---->K (Branch 2)

What am I doing wrong? Is there a way to achieve the result I want?

Thanks in advance.

Answer 1

Ok, this is better than the cherry-pick answer in my comment because if you have a lot of commits to cherry-pick that can be rather tedious (it also avoids the creation of a third branch).

The quickest thing to do is two rebase s. The first is the one you specified. Then you checkout branch 2 and rebase that on top of your already- rebase d branch 1, removing the commits you don't want ( C , D , E , F , G , and H ). So basically, you'd have:

git checkout <branch 1>
git rebase -i HEAD~7

which you already did, followed by:

git checkout <branch 2>
git rebase -i <branch 1>

When your default editor opens, simply remove the lines associated with commits C through H . The result will be what you were looking for.