Instantly share code, notes, and snippets.

What would you like to do?
Sample .gitconfig file, setup with mergetool kdiff3
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
[remote "origin"]
# below is for SSH
fetch = +refs/heads/*:refs/remotes/origin/*
[branch "master"]
remote = origin
merge = refs/heads/master
tool = kdiff3
#prompt = false
trustExitCode = false
[difftool "kdiff3"]
#cmd = kdiff3 "$LOCAL" "$REMOTE"
trustExitCode = false
tool = kdiff3
[mergetool "kdiff3"]
# Choose one of these 2 lines (not both!) explained below.
#cmd = kdiff3 "$LOCAL" "$MERGED" "$REMOTE" --output "$MERGED"
#cmd = kdiff3 "$LOCAL" "$BASE" "$REMOTE" --output "$MERGED"
trustExitCode = false
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment