By squashing the merge, you’ve created a commit which has the effect of, but is not really, a merge. That is, the working tree has the modifications you’d expect, but the metadata doesn’t: crucially, the commit doesn’t have two parents (one on master and one on alt) and therefore subsequent merges can’t figure out the … Read more
You can do an interactive rebase and hand select the commits which you want to squash. This will rewrite the history of your dev branch, but since you have not pushed these commits, there should not be any negative aftermath from this besides what might happen on your own computer. Start with the following: git … Read more
In my opinion, and bear in mind, this is just an opinion, and you will likely get different answers, you should NOT squash the commits when merging into master from the develop branch. Doing so would lose a lot of the history of the changes that have been made. For example, almost all the commits … Read more
All you have to do is: git checkout feature_branch git rebase master git checkout master git merge –squash feature_branch As the docs for git merge –squash say: Produce the working tree and index state as if a real merge happened (except for the merge information), but do not actually make a commit or move the … Read more
Here’s a script that will delete all local branches that have been squash merged into master: git checkout -q master && git for-each-ref refs/heads/ “–format=%(refname:short)” | while read branch; do mergeBase=$(git merge-base master $branch) && [[ $(git cherry master $(git commit-tree $(git rev-parse “$branch^{tree}”) -p $mergeBase -m _)) == “-“* ]] && git branch -D … Read more
Pass -n to git cherry-pick. This will apply all the commits, but not commit them. Then simply do git commit to commit all the changes in a single commit.
Assuming the feature branch is called feature and the main branch main: Create a temporary branch from main: git checkout -b temp main Squash the feature branch in: git merge –squash feature Commit the changes (the commit message contains all squashed commit messages): git commit Go back to the feature branch and point it to … 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
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