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
Just a simple addition to help someone else looking for this solution. You can pass in the number of previous commits you would like to squash. for example, git rebase -i HEAD~3 This will bring up the last 3 commits in the editor.
Make sure your working tree is clean, then git reset –soft HEAD~3 git commit -m ‘new commit message’
I saw this still here so I figured I might as well answer the question. So the answer is YES. It will remove the contributions from the graph. It won’t do it right away because commits that are no longer being pointed to by anything can technically still be reached for awhile but are eventually … 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
You can do this fairly easily without git rebase or git merge –squash. In this example, we’ll squash the last 3 commits. If you want to write the new commit message from scratch, this suffices: git reset –soft HEAD~3 && git commit If you want to start editing the new commit message with a concatenation … Read more
You can do this fairly easily without git rebase or git merge –squash. In this example, we’ll squash the last 3 commits. If you want to write the new commit message from scratch, this suffices: git reset –soft HEAD~3 && git commit If you want to start editing the new commit message with a concatenation … Read more
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
As of git 1.6.2, you can use git rebase –root -i. For each commit except the first, change pick to squash.
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