squash

How can I, with minimum effort, squash all my commits (even with merges and conflict resolutions) to a single one on a feature branch and then rebase on top of the branch where I started developing from? Don't want to redo conflict resolution that's already done . Keep hassle to a minimum. Suppose the branches we are talking about are master and featureX. The simplest way I know is git checkout featureX git merge -m "Bring latest changes from master" master # magic starts here git reset --soft master # put featureX branch pointer on top of master tip # at this point all the changes related to

I have reviewed several related questions about squashing the most recent commits and squashing a commit at the root , but neither will help me squash non-recent commits that are not at the root. Here is my starting scenario: D---E---F---G---H---I---J master and my desired result: D---E---Z---I---J master where Z is the squash of F---G---H , and F---G---H , D---E , and I---J can be an arbitrarily long sequence of non-branching commits. First approach: [lucas]/home/blah/$ git rebase -i D rebase in progress; onto D You are currently editing a commit while rebasing branch 'master' on 'D'. No

I wanted to have a simple solution to squash two merge commits together during an interactive rebase. My repository looks like: X --- Y --------- M1 -------- M2 (my-feature) / / / / / / a --- b --- c --- d --- e --- f (stable) That is, I have a my-feature branch that has been merged twice recently, with no real commits in between. I don't just want to rebase the my-feature branch since it is a published branch of its own, I just want to squash together the last two merge commits into one (haven't published those commits yet) X --- Y ---- M (my-feature) / / / / a --- ... -- f (stable) I tried: