peterkir/git_difftool.md

Created October 18, 2019 06:32

Star () You must be signed in to star a gist
Fork () You must be signed in to fork a gist

Learn more about clone URLs
Clone this repository at <script src="https://gist.github.com/peterkir/29d85ca3e91dedbaefc5beebce280c4b.js"></script>
Save peterkir/29d85ca3e91dedbaefc5beebce280c4b to your computer and use it in GitHub Desktop.

Download ZIP

Git difftool configuration - Beyond Compare

Raw

git_difftool.md

git - DiffTool configuration

MacOSX

Install and Configure Beyond Compare

Menu -> BeyondCompare -> Install Command Line Tools ...
Open a diff session e.g. Folder Compare, the Menu -> Session > Session Settings... > Handling > Follow Symbolic Links. Instead of "Use for this view only" at the bottom, select "Also update session defaults".
execute following cmds inside shell

git config --global diff.tool bc3
git config --global difftool.prompt false

git config --global merge.tool bc3
git config --global mergetool.bc3 trustExitCode true