Skip to content

Instantly share code, notes, and snippets.

@mamboer

mamboer/git.config

Forked from NickJosevski/git.config
Last active December 17, 2015 22:29
Show Gist options
  • Star 1 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save mamboer/5682580 to your computer and use it in GitHub Desktop.
Save mamboer/5682580 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
git.config
## .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
[core]
editor = 'D:/Program Files (x86)/Notepad++/notepad++.exe' -multiInst -notabbar -nosession -noPlugin
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment