You are currently browsing the tag archive for the ‘git’ tag.

[user]
    email = joseph.vano@gmail.com
    name = Joey Vano
[core]
    autocrlf = false
[diff]
    external = c:/users/jvano.fcs/difftool.sh

[merge]
    keepBackup = false;
    tool = p4merge

[mergetool "p4merge"]
    cmd = "p4merge.exe" "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
    keepTemporaries = false
    trustExitCode = false
    keepBackup = false
[color]
    ui = auto

Advertisements