[user]

name = Luis Armendariz

email = luis.armendariz@gmail.com

[alias]

st = status -sb

ci = commit

br = branch

co = checkout

df = diff

[core]

excludesfile = ~/.gitignore

[mergetool]

keepBackup = true

prompt = false

[push]

default = current

[mergetool "Kaleidoscope"]

cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot

trustexitcode = true

[merge]

tool = Kaleidoscope

[difftool "Kaleidoscope"]

cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"

[difftool]

prompt = false

[diff]

tool = Kaleidoscope

[difftool "sourcetree"]

cmd = opendiff \"$LOCAL\" \"$REMOTE\"

path =

[mergetool "sourcetree"]

cmd = /Applications/Sourcetree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"

trustExitCode = true

[filter "lfs"]

process = git-lfs filter-process

required = true

clean = git-lfs clean -- %f

smudge = git-lfs smudge -- %f