Skip to content

Instantly share code, notes, and snippets.

@qasimalyas
Created June 15, 2016 13:10
Show Gist options
  • Save qasimalyas/ec60dbede6c6b911cd8bc87e08e1b2aa to your computer and use it in GitHub Desktop.
Save qasimalyas/ec60dbede6c6b911cd8bc87e08e1b2aa to your computer and use it in GitHub Desktop.
[core]
symlinks = false
autocrlf = true
fscache = true
[color]
diff = auto
status = auto
branch = auto
interactive = true
[pack]
[help]
format = html
[http]
sslCAInfo = D:/Program Files/Git/mingw64/ssl/certs/ca-bundle.crt
[diff "astextplain"]
textconv = astextplain
[rebase]
autosquash = true
[diff]
tool = bc4
[difftool]
prompt = false
[difftool "bc4"]
#use cygpath to transform cygwin path $LOCAL (something like /tmp/U5VvP1_abc) to windows path, because bc3 is a windows software
cmd = \"D:/Program Files/Beyond Compare 4/bcomp.exe\" \"$LOCAL\" \"$REMOTE\"
[merge]
tool = bc3
[mergetool]
prompt = false
[mergetool "bc3"]
cmd = 'D:/Program Files/Beyond Compare 4/BComp.exe' \
"$PWD/$LOCAL" \
"$PWD/$REMOTE" \
"$PWD/$BASE" \
"$PWD/$MERGED"
keepBackup = false
trustExitCode = false
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment