.gitconfig-includes

[alias]
  co = checkout
  cp = cherry-pick -x
  lol = log --pretty=oneline --abbrev-commit --graph --decorate
  pp = pull --prune
  ff = merge --ff-only
  fp = fetch --prune
  lt = log --graph --pretty=format:'%Cred%h%Creset %C(yellow)%d%Creset %s %Cgreen(written %ar by %C(bold blue)%an%Cgreen, committed %ci by %C(bold blue)%cn%Cgreen)%Creset'
  lg = log --graph --pretty=format:'%Cred%h%Creset %C(yellow)%d%Creset %s %Cgreen(%ar) %C(bold blue)%an%Creset'
  dt = difftool -y
  mt = mergetool -y
  squash = rebase -i
  oldest-ancestor = !bash -c 'diff -u <(git rev-list --first-parent "${1:-master}") <(git rev-list --first-parent "${2:-HEAD}") | sed -ne "s/^ //p" | head -1' -
  force-push = push --force-with-lease
[color]
  ui = true
[branch]
  autosetuprebase = always
[push]
  default = upstream
[fetch]
  prune = true
[core]
  autocrlf = false
  excludesfile = ~/.gitignore-global
[difftool "kdiff3"]
  path = /Applications/kdiff3.app/Contents/MacOS/kdiff3
[merge]
  tool = smerge
[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
[mergetool "diffmerge"]
  cmd = diffmerge --merge --result=$MERGED $LOCAL $BASE $REMOTE
  trustExitCode = true
[difftool "diffmerge"]
  cmd = diffmerge $LOCAL $REMOTE
[mergetool]
  keepBackup = false
[mergetool "p4mergetool"]
  cmd = /Applications/p4merge.app/Contents/Resources/launchp4merge $PWD/$BASE $PWD/$REMOTE $PWD/$LOCAL $PWD/$MERGED
[diff]
  tool = smerge
[difftool "p4mergetool"]
  cmd = /Applications/p4merge.app/Contents/Resources/launchp4merge $LOCAL $REMOTE
[filter "lfs"]
  clean = git-lfs clean %f
  smudge = git-lfs smudge %f
  required = true
[mergetool "smerge"]
  cmd = smerge mergetool \"$BASE\" \"$LOCAL\" \"$REMOTE\" -o \"$MERGED\"
  trustExitCode = true
[difftool "smerge"]
  cmd = smerge mergetool --no-wait \"$LOCAL\" \"$REMOTE\"
  trustExitCode = false