# This is Git's per-user configuration file.
[user]
	name = Diego Núñez Silva
	email = XXXXXXXXXXXXXXXXXXXXXXXX
[core]
	editor = vim
	autocrlf = true
[merge]
    keepBackup = false;
    tool = p4merge
[mergetool]
    prompt = false
[mergetool "p4merge"]
    cmd = p4merge "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
    keepTemporaries = false
    trustExitCode = false
    keepBackup = false
[diff]
    tool = p4merge
[difftool]
    prompt = false
[difftool "p4merge"]
    cmd = p4merge "$LOCAL" "$REMOTE"
    keepTemporaries = false
    trustExitCode = false
    keepBackup = false
[alias]
	co = checkout
	br = branch
	st = status
	logp = log --pretty=oneline