It was a great time with SourceTree on Mac OS X, but macOS get's worse with every release since Steve is dead. I switched to Linux (first elementary OS and now NixOS) some years ago, also at work. I would love to be able to use SourceTree on Linux, but this 5 years old issue shows that Atlassian don't cares about the wishes of it's customers. This is a pain, why SourceTree is not addressing this for Mac for so many versions. – Amit Feb 10 '18 at 17:46 this helped thanks, and thanks to i realized what was the real problem - when the initial password dialog for bitbucket appeared i entered wrong password thinking it is a classical admin password for my mac. After your fix this.
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.
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: ProprietaryMagit
Platforms: Linux, Mac, Windows
Price: Free
License: GNU GPLSmartGit
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: Proprietary
Aurees
Platforms: Linux, Mac, Windows
Price: Free
License: Proprietary
Fork
Platforms: Mac, Windows
Price: $49.99, free evaluation
License: Proprietary
Working Copy
Platforms: iOS
Price: Free with in-app purchases
License: Proprietary
CodeReview
Platforms: Linux, Mac, Windows
Price: Free
License: GNU GPL
gmaster
Platforms: Windows
Price: Beta / Free for non-commercial use
License: Proprietary
Git2Go
Platforms: iOS
Price: Free with in-app purchases
License: Proprietary
GitAhead
Platforms: Linux, Mac, Windows
Price: Free
License: MIT
Pocket Git
Platforms: Android
Price: 1.99€
License: Proprietary
GitDrive
Platforms: iOS
Price: Free with in-app purchases
License: Proprietary
GitX-dev
Platforms: Mac
Price: Free
License: GNU GPL
GitBlade
Platforms: Linux, Mac, Windows
Price: Free Lite version, $59.99/user/year for PRO version
License: Proprietary
Guitar
Platforms: Linux, Mac, Windows
Price: Free
License: GNU GPL
RepoZ
Platforms: Mac, Windows
Price: Free
License: MIT
Cong
Platforms: Windows
Price: Free
License: Proprietary
Sublime Merge
Platforms: Linux, Mac, Windows
Price: $99/user, $75 annual business sub, free eval
License: Proprietary
LazyGit
Platforms: Linux, Mac, Windows
Price: Free
License: MIT
SnailGit
Platforms: Mac
Price: $9.99 / Lite version
License: Proprietary
GitAtomic
Platforms: Windows
Price: 15.00€
License: Proprietary
Gitfox
Platforms: Mac
Price: €3.99/m or €24,99/y per user
License: Proprietary
GitFiend
Platforms: Linux, Mac, Windows
Price: Free
License: Proprietary
NitroGit
Platforms: Windows
Price: 20€/user / Free for non-commercial use
License: Proprietary
GitFinder
Platforms: Mac
Price: $24.95
License: Proprietary
Vershd
Wordorigins.org. Platforms: Linux, Mac, Windows
Price: Free for personal use, otherwise $37
License: Proprietary
GitUI
Platforms: Linux, Mac, Windows
Price: Free, but donations welcome
License: MIT
PolyGit
Platforms: iOS
Price: Free with in-app purchases
License: Proprietary
There are other great GUI tools available as well. Have a look at the list of interfaces, frontends and tools in the Git Wiki.
macOS only
Beyond Compare can be configured as the external difference utility in many popular VCS applications. The following are configuration instructions submitted by our users. Let us know if you have one to add to the list.
Index:
Cornerstone SVNGitGit ForkIntelliJ IDEA 12Mercurial 2.4.2PerforceSmartCVSSmartGitSmartSVNSourceTreeSubversionSyncovery MacTower (Git)
Cornerstone SVN
In Cornerstone, you can specify a custom external compare script.
Launch Beyond Compare, go to the Beyond Compare menu and run Install Command Line Tools.
DIFF
Create an AppleScript wrapper for use by Cornerstone:Set in Preferences | General | External compare tool | Other Script..
Git
Git 2.3 and newer
(Note: Use bc3
on the command line for BC version 4. Caused by git legacy support from Linux.)
Launch Beyond Compare, go to the Beyond Compare menu and run Install Command Line Tools. Delete apps iphone.
Diff
In a terminal: git config --global diff.tool bc3
To launch a diff using Beyond Compare, use the command: git difftool file.ext
Merge
In a terminal: git config --global merge.tool bc3
git config --global mergetool.bc3.trustExitCode true
To launch a 3-way merge using Beyond Compare, use the command: git mergetool file.ext
Older versions of Git
- Launch Beyond Compare, go to the Beyond Compare menu and run Install Command Line Tools.
- Add the following lines to
$HOME/.gitconfig
:[diff]
tool = bcomp
[difftool]
prompt = false
[difftool 'bcomp']
trustExitCode = true
cmd = '/usr/local/bin/bcomp' '$LOCAL' '$REMOTE'
[merge]
tool = bcomp
[mergetool]
prompt = false
[mergetool 'bcomp']
trustExitCode = true
cmd = '/usr/local/bin/bcomp' '$LOCAL' '$REMOTE' '$BASE' '$MERGED' - To launch a diff in Beyond Compare, use:
git difftool file.ext
To launch a merge in Beyond Compare, use:git mergetool file.ext
Git Fork
Launch Beyond Compare, go to the Beyond Compare menu and run Install Command Line Tools.
Diff
- Select Preferences from the Fork menu.
- Select Integration.
- Select 'Beyond Compare' from the External Diff Tool drop down.
Merge
- Select Preferences from the Fork menu.
- Select Integration.
- Select 'Beyond Compare' from the Merge Tool drop down.
IntelliJ IDEA
(Potentially, also RubyMine, Webstorm, PyCharm, PhpStorm)
The first step is to launch Beyond Compare, go to the Beyond Compare menu and run Install Command Line Tools.
In IntelliJ's Settings dialog, under IDE Settings, select the External Diff Tools section:
Compare foldersDownload Sourcetree For Mac
Path to executable: /usr/local/bin/bcomp
Compare files
Path to executable: /usr/local/bin/bcomp
Merge tool
Path to executable: /usr/local/bin/bcomp
Parameters: %1 %2 %3 %4
Mercurial 2.4.2
Launch Beyond Compare, go to the Beyond Compare menu and run Install Command Line Tools.
Perforce
Launch Beyond Compare, go to the Beyond Compare menu and run Install Command Line Tools.
Diff
- Go to the P4V menu and select Preferences.
- Go to the Diff section and select Other application.
- Location:
/usr/local/bin/bcomp
- Arguments:
%1 %2
Merge
- Go to the P4V menu and select Preferences.
- Go to the Merge section and select Other application.
- Location:
/usr/local/bin/bcomp
- Arguments:
%1 %2 %b %r
SmartCVS
- Launch Beyond Compare, go to the Beyond Compare menu and run Install Command Line Tools.
- Launch SmartCVS, select Preferences | File Comparators.
- Select * in the table and click edit.
- Add
/usr/local/bin/bcomp
in Command and${leftFile} ${rightFile}
in Arguments. - Click OK.
SmartGit
Launch Beyond Compare, go to the Beyond Compare menu and run Install Command Line Tools.
Diff
- Select SmartGit | Preferences.
- Go to Tools > Diff Tools.
- Click Add.
- File Pattern: *
- Select External diff tool.
- Command:
/usr/local/bin/bcomp
- Arguments:
-readonly -lefttitle=${leftTitle} -righttitle=${rightTitle} ${leftFile} ${rightFile}
Merge
- Select SmartGit | Preferences.
- Go to Tools > Conflict Solvers.
- Click Add.
- File Pattern: *
- Select External Conflict Solver.
- Command:
/usr/local/bin/bcomp
- Arguments:
${leftFile} ${rightFile} ${baseFile} -mergeoutput=${mergedFile}
SmartSVN
- Launch Beyond Compare, go to the Beyond Compare menu and run Install Command Line Tools.
- Launch SmartSVN, select Preferences | File Comparators.
- Select * in the table and click edit.
- Add
/usr/local/bin/bcomp
in Command and${leftFile} ${rightFile}
in Arguments. - Click OK.
SourceTree
From the Beyond Compare menu, Install Command Line Tools. Then:
Subversion
Sourcetree For Mac Big Sur
Launch Beyond Compare, go to the Beyond Compare menu and run Install Command Line Tools.
Diff
Create a file named /usr/local/bin/bcdiff.sh
and allow execute permissions (chmod +x). Add the following lines:/usr/local/bin/bcomp '$6' '$7' -title1='$3' -title2='$5' -readonly
exit 0
Edit $HOME/.subversion/config
and add the line diff-cmd = /usr/local/bin/bcdiff.sh
in [Helpers].
Merge
Create a file named /usr/local/bin/bcmerge.sh
and allow execute permissions (chmod +x). Add the following line:/usr/local/bin/bcomp '$2' '$3' '$1' '$4'
Edit $HOME/.subversion/config
and add the line merge-tool-cmd = /usr/local/bin/bcmerge.sh
in [Helpers].
Syncovery Mac
Sourcetree For Mac 10.13.6
The first step is to launch Beyond Compare, go to the Beyond Compare menu and run Install Command Line Tools.
Then to configure Syncovery:
How To Use Sourcetree On Mac
- Select menu Syncovery/Preferences.
- Click the Misc tab.
- In the field Program used to compare files from the Sync Preview, write
/usr/local/bin/bcompare
(or the pathname given when using BC4's Install Command Line Tools). - Click Close.
Sourcetree For Mac
Tower (Git)
Download Sourcetree For Mac
It was a great time with SourceTree on Mac OS X, but macOS get's worse with every release since Steve is dead. I switched to Linux (first elementary OS and now NixOS) some years ago, also at work. I would love to be able to use SourceTree on Linux, but this 5 years old issue shows that Atlassian don't cares about the wishes of it's customers. This is a pain, why SourceTree is not addressing this for Mac for so many versions. – Amit Feb 10 '18 at 17:46 this helped thanks, and thanks to i realized what was the real problem - when the initial password dialog for bitbucket appeared i entered wrong password thinking it is a classical admin password for my mac. After your fix this.
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.
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: ProprietaryMagit
Platforms: Linux, Mac, Windows
Price: Free
License: GNU GPLSmartGit
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: $49.99, free evaluation
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: MITCong
Platforms: Windows
Price: Free
License: ProprietarySublime Merge
Platforms: Linux, Mac, Windows
Price: $99/user, $75 annual business sub, free eval
License: ProprietaryLazyGit
Platforms: Linux, Mac, Windows
Price: Free
License: MITSnailGit
Platforms: Mac
Price: $9.99 / Lite version
License: ProprietaryGitAtomic
Platforms: Windows
Price: 15.00€
License: ProprietaryGitfox
Platforms: Mac
Price: €3.99/m or €24,99/y per user
License: ProprietaryGitFiend
Platforms: Linux, Mac, Windows
Price: Free
License: ProprietaryNitroGit
Platforms: Windows
Price: 20€/user / Free for non-commercial use
License: ProprietaryGitFinder
Platforms: Mac
Price: $24.95
License: ProprietaryVershd
Wordorigins.org. Platforms: Linux, Mac, Windows
Price: Free for personal use, otherwise $37
License: ProprietaryGitUI
Platforms: Linux, Mac, Windows
Price: Free, but donations welcome
License: MITPolyGit
Platforms: iOS
Price: Free with in-app purchases
License: Proprietary
There are other great GUI tools available as well. Have a look at the list of interfaces, frontends and tools in the Git Wiki.
macOS only
Beyond Compare can be configured as the external difference utility in many popular VCS applications. The following are configuration instructions submitted by our users. Let us know if you have one to add to the list.
Index:
Cornerstone SVNGitGit ForkIntelliJ IDEA 12Mercurial 2.4.2PerforceSmartCVSSmartGitSmartSVNSourceTreeSubversionSyncovery MacTower (Git)
Cornerstone SVN
In Cornerstone, you can specify a custom external compare script.
Launch Beyond Compare, go to the Beyond Compare menu and run Install Command Line Tools.
DIFF
Create an AppleScript wrapper for use by Cornerstone:Set in Preferences | General | External compare tool | Other Script..
Git
Git 2.3 and newer
(Note: Use bc3
on the command line for BC version 4. Caused by git legacy support from Linux.)
Launch Beyond Compare, go to the Beyond Compare menu and run Install Command Line Tools. Delete apps iphone.
Diff
In a terminal: git config --global diff.tool bc3
To launch a diff using Beyond Compare, use the command: git difftool file.ext
Merge
In a terminal: git config --global merge.tool bc3
git config --global mergetool.bc3.trustExitCode true
To launch a 3-way merge using Beyond Compare, use the command: git mergetool file.ext
Older versions of Git
- Launch Beyond Compare, go to the Beyond Compare menu and run Install Command Line Tools.
- Add the following lines to
$HOME/.gitconfig
:[diff]
tool = bcomp
[difftool]
prompt = false
[difftool 'bcomp']
trustExitCode = true
cmd = '/usr/local/bin/bcomp' '$LOCAL' '$REMOTE'
[merge]
tool = bcomp
[mergetool]
prompt = false
[mergetool 'bcomp']
trustExitCode = true
cmd = '/usr/local/bin/bcomp' '$LOCAL' '$REMOTE' '$BASE' '$MERGED' - To launch a diff in Beyond Compare, use:
git difftool file.ext
To launch a merge in Beyond Compare, use:git mergetool file.ext
Git Fork
Launch Beyond Compare, go to the Beyond Compare menu and run Install Command Line Tools.
Diff
- Select Preferences from the Fork menu.
- Select Integration.
- Select 'Beyond Compare' from the External Diff Tool drop down.
Merge
- Select Preferences from the Fork menu.
- Select Integration.
- Select 'Beyond Compare' from the Merge Tool drop down.
IntelliJ IDEA
(Potentially, also RubyMine, Webstorm, PyCharm, PhpStorm)
The first step is to launch Beyond Compare, go to the Beyond Compare menu and run Install Command Line Tools.
In IntelliJ's Settings dialog, under IDE Settings, select the External Diff Tools section:
Compare foldersDownload Sourcetree For Mac
Path to executable: /usr/local/bin/bcomp
Compare files
Path to executable: /usr/local/bin/bcomp
Merge tool
Path to executable: /usr/local/bin/bcomp
Parameters: %1 %2 %3 %4
Mercurial 2.4.2
Launch Beyond Compare, go to the Beyond Compare menu and run Install Command Line Tools.
Perforce
Launch Beyond Compare, go to the Beyond Compare menu and run Install Command Line Tools.
Diff
- Go to the P4V menu and select Preferences.
- Go to the Diff section and select Other application.
- Location:
/usr/local/bin/bcomp
- Arguments:
%1 %2
Merge
- Go to the P4V menu and select Preferences.
- Go to the Merge section and select Other application.
- Location:
/usr/local/bin/bcomp
- Arguments:
%1 %2 %b %r
SmartCVS
- Launch Beyond Compare, go to the Beyond Compare menu and run Install Command Line Tools.
- Launch SmartCVS, select Preferences | File Comparators.
- Select * in the table and click edit.
- Add
/usr/local/bin/bcomp
in Command and${leftFile} ${rightFile}
in Arguments. - Click OK.
SmartGit
Launch Beyond Compare, go to the Beyond Compare menu and run Install Command Line Tools.
Diff
- Select SmartGit | Preferences.
- Go to Tools > Diff Tools.
- Click Add.
- File Pattern: *
- Select External diff tool.
- Command:
/usr/local/bin/bcomp
- Arguments:
-readonly -lefttitle=${leftTitle} -righttitle=${rightTitle} ${leftFile} ${rightFile}
Merge
- Select SmartGit | Preferences.
- Go to Tools > Conflict Solvers.
- Click Add.
- File Pattern: *
- Select External Conflict Solver.
- Command:
/usr/local/bin/bcomp
- Arguments:
${leftFile} ${rightFile} ${baseFile} -mergeoutput=${mergedFile}
SmartSVN
- Launch Beyond Compare, go to the Beyond Compare menu and run Install Command Line Tools.
- Launch SmartSVN, select Preferences | File Comparators.
- Select * in the table and click edit.
- Add
/usr/local/bin/bcomp
in Command and${leftFile} ${rightFile}
in Arguments. - Click OK.
SourceTree
From the Beyond Compare menu, Install Command Line Tools. Then:
Subversion
Sourcetree For Mac Big Sur
Launch Beyond Compare, go to the Beyond Compare menu and run Install Command Line Tools.
Diff
Create a file named /usr/local/bin/bcdiff.sh
and allow execute permissions (chmod +x). Add the following lines:/usr/local/bin/bcomp '$6' '$7' -title1='$3' -title2='$5' -readonly
exit 0
Edit $HOME/.subversion/config
and add the line diff-cmd = /usr/local/bin/bcdiff.sh
in [Helpers].
Merge
Create a file named /usr/local/bin/bcmerge.sh
and allow execute permissions (chmod +x). Add the following line:/usr/local/bin/bcomp '$2' '$3' '$1' '$4'
Edit $HOME/.subversion/config
and add the line merge-tool-cmd = /usr/local/bin/bcmerge.sh
in [Helpers].
Syncovery Mac
Sourcetree For Mac 10.13.6
The first step is to launch Beyond Compare, go to the Beyond Compare menu and run Install Command Line Tools.
Then to configure Syncovery:
How To Use Sourcetree On Mac
- Select menu Syncovery/Preferences.
- Click the Misc tab.
- In the field Program used to compare files from the Sync Preview, write
/usr/local/bin/bcompare
(or the pathname given when using BC4's Install Command Line Tools). - Click Close.
Sourcetree For Mac
Tower (Git)
Download Sourcetree For Mac
Sourcetree For Mac M1
(Requires Tower 2.0.5 or newer)- Launch Beyond Compare, go to the Beyond Compare menu and run Install Command Line Tools.
- Open Tower's preferences dialog on the Git Config Tab.
- Set the Diff Tool drop-down to Beyond Compare.
- Set the Merge tool drop-down to Beyond Compare.