Git Gui Tool For Mac
FileMerge
Being part of its developer toolset, Apple's own merge tool comes at no additional costs. It might not be the most elegant tool, but it's definitely a solid one that does the job of comparing & merging text.
1) Install Git on Mac OS X with the Git OS X installer The simplest way to install Git on Mac OS X is to use a project named ' Git OS X installer ', which is hosted on Google Code. As of this writing (June 14, 2010), this GUI installer is very up to date, with a recent release on May 7, 2010.
Beyond Compare
Originally a product for Microsoft Windows, the Beyond Compare team has contributed a fine diff tool to the Mac platform. Like Araxis Merge and DeltaWalker, it goes beyond (pun intended) comparing simple text and also allows diffing Word and PDF contents. In its 'Pro Version', it also supports merging.
- It is a command line tool which opens the GUI of FileMerge. You could instruct Git to use it automatically for git-mergetool with: git config --global merge.tool opendiff.
- I'm looking at porting my projects to Git from SVN (I'm convinced that Git is worth the move) and I'm trying to come up with a set of tools to use for the project.
- Git comes with built-in GUI tools for committing and browsing (), but there are several third-party tools for users looking for platform-specific experience.If you want to add another GUI tool to this list, just follow the instructions. All Windows Mac Linux Android iOS.
- Choosing the right Git GUI client for Mac OS X Vincent Danen is a Subversion fan, but coming around to Git for the Mac. Before learning the command line for Git, he shopped around for a GUI client.
Araxis Merge
One of the few diff tools that works with more than just text and image files, Araxis Merge lets you also compare office documents (like MS Word, Excel, Powerpoint, or ODF). For people working on both Windows and Mac, it's great to know that a single license is valid for both platforms.
NEW: Image Diffing in Tower! Our popular Git client Tower now supports Image Diffing for a variety of formats (including PNG, JPG, GIF, BMP, TIFF, JPEG2000, and HEIC). In both the Working Copy and various History / Changeset views, you can now see the actual images - and how they were changed! Try it yourself - for free!
DeltaWalker
Just like Araxis, the DeltaWalker app also lets you compare office files. However, it goes one step further by letting you compare file archives like ZIP, JAR, and TAR files. Also, if you're regularly performing comparisons on a folder basis, DeltaWalker shines with a great performance in this area.
Kaleidoscope
Originally developed by 'Sofa', Kaleidoscope was later acquired by 'BlackPixel' - who did a great job in making it one of the best diff & merge tools for the Mac. Its beautiful user interface and great image diffing capabilities are what set it apart.
Free Alternatives
Git Gui Tool For Mac
In case you're looking for a free alternative to the standard FileMerge app, you should also have a look at P4Merge and DiffMerge.
Both can't compare in terms of features and user interface with their commercial competitors - but make for a valid alternative on Mac, Windows, and Linux.
Integrations
Another aspect to watch out for is integrations: before choosing your favorite tool, you should make sure that it plays nicely with the rest of your tool chain. I can already confirm that all of the mentioned tools work seamlessly at least with Tower, our own Git client.
If you don't need the power of a dedicated Diff tool application, the integrated diff views in Tower might be absolutely sufficient for you:
In case you don't know Tower: it's the Git desktop client for Mac and Windows that helps thousands of developers and designers to easily & productively work with the Git version control system. Try it 30 days for free!
Conclusion
Diff & merge apps are amongst the most underestimated tools. But a good one can be really helpful in a lot of situations. Try one of the above and see for yourself!
Get the Git Cheat Sheet
Download one of the web's most popular resources on Git! It's free!
What git GUI tool would you recommend for Windows and Mac?
I have tried SourceTree. While I find it nice, it crashes every once in a while. Anyone would suggest something instead and why?
4 Answers
For a cross platform git GUI you could try GitKraken:
- Cross-platform
- 100% standalone, i.e. just install it and it runs (you don't have to even install git).
- Built in merge tool
- Free (Gratis) but closed source (possible non-free pro version in the pipeline)
- GitHub & BitBucket integration.
- Keyboard Shortcuts
TortoiseGit is a good one for Windows. It integrates into the context menu and allows you to right-click on files/folders and perform Git operations. It also overlays icons so you can see at a glance the status of files and folders. TortoiseGit has useful displays and graphs of the revision history. Unfortunately, TortoiseGit is not available for Mac.
Of course, as was mentioned above, there are other GUI's for Windows and Mac.
I've always gotten on well with Atlassian's SourceTree.
It's very 'native' and works well with git / hg.
Windows Git Gui
Fork is my favourite and it's free! It's got a great gui as well