![Diff merge tool for mac Diff merge tool for mac](/uploads/1/2/6/4/126405654/202053411.png)
Best Git Merge Tool Windows
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. Open the project in PHP Storm (see notes below) Open iTerm2 (or any other terminal emulator) Use git difftool as you normally would (e.g., git difftool.htaccess); Observations. If you don’t have PHPStorm open when you try to use git difftool it doesn’t seem to work.I need to see if I can get it to open non PHP Storm projects, and/or I need to figure out how to switch on-the-fly between.
Git comes with built-in GUI tools for committing (git-gui) and browsing (gitk), 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.
Git Graphical Merge Tool Mac
SourceTree
Platforms: Mac, Windows
Price: Free
License: ProprietaryGitHub Desktop
Platforms: Mac, Windows
Price: Free
License: MITTortoiseGit
Platforms: Windows
Price: Free
License: GNU GPLGit Extensions
Platforms: Linux, Mac, Windows
Price: Free
License: GNU GPLGitKraken
Platforms: Linux, Mac, Windows
Price: Free / $29 / $49
License: ProprietarySmartGit
Platforms: Linux, Mac, Windows
Price: $79/user / Free for non-commercial use
License: ProprietaryTower
Platforms: Mac, Windows
Price: $79/user (Free 30 day trial)
License: ProprietaryGitUp
Platforms: Mac
Price: Free
License: GNU GPLGitEye
Platforms: Linux, Mac, Windows
Price: Free
License: Proprietarygitg
Platforms: Linux, Windows
Price: Free
License: GNU GPLungit
Platforms: Linux, Mac, Windows
Price: Free
License: MITgit-cola
Platforms: Linux, Mac, Windows
Price: Free
License: GNU GPLCycligent Git Tool
Platforms: Linux, Mac, Windows
Price: Free
License: Proprietarygiggle
Platforms: Linux
Price: Free
License: GNU GPLGitbox
Platforms: Mac
Price: $14.99
License: ProprietaryAurees
Platforms: Linux, Mac, Windows
Price: Free
License: ProprietaryFork
Platforms: Mac, Windows
Price: Free
License: ProprietaryWorking Copy
Platforms: iOS
Price: Free with in-app purchases
License: ProprietaryCodeReview
Platforms: Linux, Mac, Windows
Price: Free
License: GNU GPLgmaster
Platforms: Windows
Price: Beta / Free for non-commercial use
License: ProprietaryGit2Go
Platforms: iOS
Price: Free with in-app purchases
License: ProprietaryGitAhead
Platforms: Linux, Mac, Windows
Price: Free
License: MITPocket Git
Platforms: Android
Price: 1.99€
License: ProprietaryGitDrive
Platforms: iOS
Price: Free with in-app purchases
License: ProprietaryGitX-dev
Platforms: Mac
Price: Free
License: GNU GPLGitBlade
Platforms: Linux, Mac, Windows
Price: Free Lite version, $59.99/user/year for PRO version
License: ProprietaryGuitar
Platforms: Linux, Mac, Windows
Price: Free
License: GNU GPLRepoZ
Platforms: Mac, Windows
Price: Free
License: MITGitAtomic
Platforms: Windows
Price: 15.00€
License: ProprietarySublime Merge
Platforms: Linux, Mac, Windows
Price: $99/user, $75 annual business sub, free eval
License: ProprietarySnailGit
Platforms: Mac
Price: $9.99 / Lite version
License: ProprietaryGitFinder
Platforms: Mac
Price: $24.95
License: ProprietaryGitfox
Platforms: Mac
Price: 29€/user
License: ProprietaryNitroGit
Platforms: Windows
Price: 20€/user / Free for non-commercial use
License: ProprietaryGitFiend
Platforms: Linux, Mac, Windows
Price: Free
License: Proprietary
Best Git Mergetool
There are other great GUI tools available as well. Have a look at the list of interfaces, frontends and tools in the Git Wiki.