Skip to content

Instantly share code, notes, and snippets.

@kaskavalci

kaskavalci/.gitconfig

Created September 26, 2015 10:36
Show Gist options
  • Save kaskavalci/d989bfc1074b327936a9 to your computer and use it in GitHub Desktop.
Save kaskavalci/d989bfc1074b327936a9 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
.gitconfig
[difftool]
prompt = false
[mergetool]
prompt = false
[difftool "selectiveDiff"]
cmd = difftool.sh $LOCAL $REMOTE $BASE $MERGED
keepBackup = false
[mergetool "selectiveMerge"]
cmd = mergetool.sh $LOCAL $REMOTE $BASE $MERGED
keepBackup = false
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment