Skip to content

Instantly share code, notes, and snippets.

@hollychen503

hollychen503/bcompare-git.md

Forked from jfromaniello/bcompare-git.md
Last active March 16, 2019 12:39
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 hollychen503/ffc2e6504c1c0d25758089150e11a298 to your computer and use it in GitHub Desktop.
Save hollychen503/ffc2e6504c1c0d25758089150e11a298 to your computer and use it in GitHub Desktop.
Download ZIP
Integrate beyond compare 4 with git
Raw
bcompare-git.md

Install command line tools:

then run this:


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


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

ln -s /usr/local/bin/bcomp /usr/local/bin/bc3

now use git difftool and git mergetool.

SourceTree

For diff:

Visual Diff Tool: Other, Command: /usr/local/bin/bcomp, Arguments: $LOCAL $REMOTE

For merge:

Visual Diff Tool: Other, Command: /usr/local/bin/bcomp, Arguments: $LOCAL $REMOTE $BASE -mergeoutput=$MERGED

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment