It probably doesn’t let you because such a command wouldn’t make sense. The documentation for –squash says (emphasis mine): –squash 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 HEAD, nor record GIT_DIR/MERGE_HEAD to cause the … Read more
I was able to squash several commits after multiple merges from the master branch using the strategy found here: https://stackoverflow.com/a/17141512/1388104 git checkout my-branch # The branch you want to squash git branch -m my-branch-old # Change the name to something old git checkout master # Checkout the master branch git checkout -b my-branch # Create … Read more
If you don’t need the commit information, then you could just do a soft reset. Then files remain as they were and when you commit, this commit will be on top of the commit you did reset to. To find the commit to reset to: git merge-base HEAD BRANCH_YOU_BRANCHED_FROM Then git reset –soft COMMIT_HASH Then … Read more
This is an old topic, but I just ran across it while looking for similar information. A trick similar to the one described in Subtree octopus merge is a really good solution to this type of problem: git checkout my-feature git reset –soft Y git rev-parse f > .git/MERGE_HEAD git commit That will take the … Read more
git merge –no-commit This is just like a normal merge but doesn’t create a merge-commit. This commit will be a merge commit: when you look at the history, your commit will appear as a normal merge. git merge –squash This will merge the changes into your working tree without creating a merge commit. When you … Read more
The differences These options exists for separate purposes. Your repository ends up differently. Let’s suppose that your repository is like this after you are done developing on the topic branch: –squash If you checkout master and then git merge –squash topic; git commit -m topic, you get this: –no-ff –no-commit Instead, if you do git … Read more
If I add a secret file in my first layer, then use the secret file in my second layer, and the finally remove my secret file in the third layer, and then build with the –squash flag. Will there be any way now to get the secret file? Answer: Your image won’t have the secret … 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.
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’