Skip to content

Instantly share code, notes, and snippets.

@carlware
Forked from NickJosevski/git.config
Last active August 29, 2015 14:01
Show Gist options
  • Save carlware/7cd1beb7d5e6fcc44fc8 to your computer and use it in GitHub Desktop.
Save carlware/7cd1beb7d5e6fcc44fc8 to your computer and use it in GitHub Desktop.
## .gitconfig
[alias]
dt = difftool
mt = mergetool
[diff]
tool = bc3
[difftool]
prompt = false
[difftool "bc3"]
cmd = \"c:/program files (x86)/beyond compare 3/bcomp.exe\" \"$LOCAL\" \"$REMOTE\"
[merge]
tool = bc3
[mergetool]
prompt = false
keepBackup = false
[mergetool "bc3"]
cmd = \"c:/program files (x86)/beyond compare 3/bcomp.exe\" \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"
trustExitCode = true
[diff]
tool = mybc3
[difftool "mybc3"]
cmd = \"c:/program files/beyond compare 3/BComp.com\" \"$(cygpath -w \"$LOCAL\")\" \"$(cygpath -w \"$REMOTE\")\" /lefttitle=\"$(cygpath -w \"$LOCAL\")\" /righttitle=\"$(cygpath -w \"$REMOTE\")\" /leftreadonly /rightreadonly
[difftool]
prompt = false
[merge]
tool = mybc3
[mergetool "mybc3"]
cmd = \"c:/program files/beyond compare 3/BComp.com\" \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\" /lefttitle=\"$LOCAL\" /righttitle=\"$REMOTE\" /centertitle=\"$BASE\" /outputtitle=\"$MERGED\" /leftreadonly /rightreadonly /centerreadonly
keepBackup = false
trustExitCode = true
[mergetool]
prompt = false
# http://blog.kifaru.be/2011/07/how-to-configure-git-on-windows-under-cygwin-to-use-beyond-compare-3/
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment