问题
Sometimes I need to merge squash from Eclipse. I know I can do it in command line, but it will be really useful to have graphic option integrated in Eclipse. Do you know how to do it?
回答1:
You can start an interactive rebase in EGit, and select squash for the commits you want squashed.
Note: for squashing the last few commits, historically the other way was a soft reset (see this thread)
- select in history the first commit which I don't want to squash
- right-click and say "
Team->Reset->Soft
"- right-click and say "
Commit
". This commit will contain all the changes of the last m commits together
回答2:
Just open the context menu on your project and choose Team > Merge.... In the resulting dialog select the option "Squash" and the branch to merge.
Also see VonC's answer for other options.
来源:https://stackoverflow.com/questions/24077750/how-to-git-merge-squash-in-eclipse