This is _just one_ way of doing it:

git checkout topic
git rebase -i HEAD~3 # and squash commits A and B

This will make the tree appear as:

            A---B---C---H---I  anotherTopic
           /
          /-M' topic
         /
    D---E---F---G master

Since it's just 2 commits left in anotherTopic that you care about,
I'd do:

git checkout -b new_anotherTopic
git cherry-pick H
git cherry-pick I
git branch -D anotherTopic
git checkout master
git branch -m new_anotherTopic anotherTopic

And that'd make:

             H---I  anotherTopic
            /
          M' topic
         /
    D---E---F---G master

HTH.

--
Jeenu

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.

Reply via email to