A little bit about why this happens: I’ll let O be “original master” and FB be “new master”, after a feature branch has been merged in: Say feature_branch looks like: O – A – B – C dependent_feature has a few extra commits on top of that: O – A – B – C – … Read more
Make sure your working tree is clean, then git reset –soft HEAD~3 git commit -m ‘new commit message’
I do not know what Git Extensions does with it specifically, but git rebase has an option to automatically squash or fixup commits with squash! or fixup! prefixes, respectively: –autosquash, –no-autosquash When the commit log message begins with “squash! …” (or “fixup! …”), and there is a commit whose title begins with the same …, … Read more
I’d recommend doing this on a throwaway branch as follows. If your commits are in the “newlines” branch and you have switched back to your “master” branch already, this should do the trick: [adam@mbp2600 example (master)]$ git checkout -b tmpsquash Switched to a new branch “tmpsquash” [adam@mbp2600 example (tmpsquash)]$ git merge –squash newlines Updating 4d2de39..b6768b2 … Read more
Merge commits: retains all of the commits in your branch and interleaves them with commits on the base branch Merge Squash: retains the changes but omits the individual commits from history Rebase: This moves the entire feature branch to begin on the tip of the master branch, effectively incorporating all of the new commits in … Read more
Update July 2012 (git 1.7.12+) You now can rebase all commits up to root, and select the second commit Y to be squashed with the first X. git rebase -i –root master pick sha1 X squash sha1 Y pick sha1 Z git rebase [-i] –root $tip This command can now be used to rewrite all … Read more
As of git 1.6.2, you can use git rebase –root -i For each commit except the first, change pick to squash.
Squash commits locally with git rebase -i origin/master~4 master and then force push with git push origin +master Difference between –force and + From the documentation of git push: Note that –force applies to all the refs that are pushed, hence using it with push.default set to matching or with multiple push destinations configured with … Read more