.gitconfig
# This is Git's per-user configuration file.
[user]
name = Diego Núñez Silva
email = XXXXXXXXXXXXXXXXXXXXXXXX
[core]
editor = vim
# On Linux/Mac
#autocrlf = input
# On Windows
#autocrlf = true
[init]
#defaultBranch = main
[merge]
keepBackup = false;
tool = p4merge
[mergetool]
prompt = false
[mergetool "p4merge"]
cmd = p4merge "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
#cmd = /mnt/c/Program\\ Files/Perforce/p4merge.exe "$(wslpath -aw $BASE)" "$(wslpath -aw $LOCAL)" "$(wslpath -aw $REMOTE)" "$(wslpath -aw $MERGED)"
keepTemporaries = false
trustExitCode = false
keepBackup = false
[diff]
tool = p4merge
[difftool]
prompt = false
[difftool "p4merge"]
cmd = p4merge "$LOCAL" "$REMOTE"
#cmd = /mnt/c/Program\\ Files/Perforce/p4merge.exe "$(wslpath -aw $LOCAL)" "$(wslpath -aw $REMOTE)"
keepTemporaries = false
trustExitCode = false
keepBackup = false
[alias]
co = checkout
br = branch
st = status
logp = log --pretty=oneline