What are the differences between `--squash` and `--no-ff --no-commit`?
Which one should one use to hide microcommits?
Is the only difference between git merge --squash and git merge --no-ff --no-commit the denial of the other parents?
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:
https://i.stack.imgur.com/cbPxa.png
--squash
If you checkout master and then git merge --squash topic; git commit -m topic, you get this:
https://i.stack.imgur.com/4qDmI.png
--no-ff --no-commit
Instead, if you do git merge --no-ff --no-commit; git commit -m topic, you get this:
https://i.stack.imgur.com/BLiIy.png
Hiding micro-commits
If you really want to hide (I mean delete from your repository) your micro-commits, use --squash. Because, as you can see in the above images, you are not really hiding your micro-commits if you do not squash. Moreover, you do not usually push your topic branches to the world. Topic branches are for topic to get mature.
If you want your history to have all your micro-commits, but leave them in another line of development (the green line in the above images), use --no-ff --no-commit. But please remember that a) this is not a branch, and b) does not really mean anything in Git because it is just another parent of your commit.
Please refer to Git Branching - What a Branch Is if you really want to understand.
Follow WeChat
Success story sharing
Want to stay one step ahead of the latest teleworks?
Subscribe Now相似问题
- I ran into a merge conflict. How do I abort the merge?
- Undoing a git rebase
- View the change history of a file using Git versioning
- What is the difference between 'git pull' and 'git fetch'?
- How to retrieve the hash for the current commit in Git?
- How do I delete a commit from a branch?
- Move the most recent commit(s) to a new branch with Git
- How can I merge multiple commits onto another branch as a single squashed commit?
- How do I safely merge a Git branch into master?
- What are the differences between .gitignore and .gitkeep?
-no-ffto do hide micro-commits? -> stackoverflow.com/a/2850413/321973--no-ffis to tell git "Do not first forward even if you can. instead create a merge commit and reuse all existing commits."--no-ffconserves that split--squashdoes. Yes, you can hide your micro-commits in the development line, but that does not mean another branch as you described above. Because you are merging your development branch to the master, it will no longer be a separate branch.-no-ff --no-commitdoes not hide the existence of micro-commits, while--squashdoes", and that is the only difference, I'd accept this answer