Any gui for git merge (w squash)?

git user-interface merge branch squash
Tom Fishman picture Tom Fishman · Oct 8, 2011 · Viewed 13k times · Source

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?

Answer

VonC picture VonC · Oct 8, 2011

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".

Related questions

A pretty and feature rich git GUI for Linux

I was checking out for a rich GUI for Git on Linux. Of late I have started using it a lot and find that even though command-line is very useful, I would still want a GUI at my disposal since …

Read More
Why can't I use TortoiseMerge as my git merge tool on Windows?

I'm trying to perform my first Git merge ever (exciting!), but can't get Git Gui (0.13.GITGUI from Git 1.7.4.msysgit.0) to recognize TortoiseMerge (1.6.11.20210 x64) on Windows 7. Based on an answer to a similar question, I've made the following configuration changes: $ git …

Read More
Merge conflict resolution

When there's a merge conflict in Git, junk like the following is inserted into the conflicting files. Three questions: How do you read these annotations? What are some strategies to use when fixing these merge conflicts? Is there a GUI …

Read More