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
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
What you want to do is referred to as “squashing” in git. There are lots of options when you’re doing this (too many?) but if you just want to merge all of your unpushed commits into a single commit, do this: git rebase -i origin/master This will bring up your text editor (-i is for … Read more
Say your bug fix branch is called bugfix and you want to merge it into master: git checkout master git merge –squash bugfix git commit This will take all the commits from the bugfix branch, squash them into 1 commit, and merge it with your master branch. Explanation: git checkout master Switches to your master … Read more
Squash my last X commits together using Git