[git-users] Re: squash a branched branch?

2011-06-23 Thread Brian
Awesome. I think I was hoping for something a little more auto-magic (that would improve my understanding), but this completely works. And is easy. And will completely solve my problem. Thanks! On Jun 22, 2:01 am, Jeenu gro...@jeenuv.otherinbox.com wrote: This is _just one_ way of doing it:

[git-users] Re: squash a branched branch?

2011-06-22 Thread Jeenu
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