CODEWITHSUNDEEP
eclipsegitmergeegitsquash
Kritana
Kritana

Reputation: 2326

How to git merge squash in Eclipse

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?

Upvotes: 6

Views: 4014

Answers (2)

robinst
robinst

Reputation: 31407

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.

Upvotes: 2

VonC
VonC

Reputation: 1323383

You can start an interactive rebase in EGit, and select squash for the commits you want squashed.

http://wiki.eclipse.org/images/0/0b/Egit-3.2-InteractiveRebaseView.png

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

Upvotes: 4

Related Questions