Alex Rivera | Logout

Any gui for git merge (w squash)?

Asked 2011-10-08T04:56:05.283
13

My work flow:

  • branch from master
  • work in my branch, commit frequently (100+)
  • when the job is done in my branch, merge master into my branch, resolve all the conflict.
  • CODE REVIEW TIME before merging back to master

For CODE REVIEW, I need to show the differences between two heads and squash/organize my commits ( in about 5 commits ). What's the best GUI (cross-platform?) for this task?

git user-interface merge branch squash
Edit
Report

1 Answer

10

The Sourcetree free Git GUI for Windows and Mac supports this.

Alternatively, to do it without a GUI, you can run 

 git rebase --interactive --autosquash

because you committed with commit message beginning with !squash (when those intermediate commits were about the same task)
See "Trimming GIT Checkins/Squashing GIT History".

answered 2011-10-08T07:32:04.467

Your Answer