Skip to content

Instantly share code, notes, and snippets.

@peterkir

peterkir/git_difftool.md

Created October 18, 2019 06:32
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save peterkir/29d85ca3e91dedbaefc5beebce280c4b to your computer and use it in GitHub Desktop.
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

  1. Menu -> BeyondCompare -> Install Command Line Tools ...
  2. 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".
  3. 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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment