gitconfig

[user]
	name = Craig Kochis
	email = cjkochis@gmail.com

[color]
  diff = auto
  status = auto
  branch = auto
  interactive = auto
	ui = always

[alias]
  stat = status -s
  st = status -sb
  ci = commit
  co = checkout
  br = branch
  cp = cherry-pick
  m = merge --no-ff --no-commit
  f = fetch --prune
  pre = pull --rebase
  cleanbr = !git branch -r --no-color --merged | grep -v \"\\(master\\|develop\\|integration\\)\" | sed \"s/\\// :/\" | xargs -L1 git push && git branch --no-color --merged | grep -v \"\\(master\\|develop\\)\" | xargs -L1 git br -d
  di = diff
  dc = diff --cached
  amend = commit --amend
  aa = add --all
  head = !git l -1
  h = !git head
  r = !git l -20
  ra = !git r --all
  ff = merge --ff-only
  pullff = pull --ff-only
  noff = merge --no-ff
  l = log --graph --abbrev-commit --date=relative 
  la = !git l --all
  div = divergence
  gn = goodness
  gnc = goodness --cached
  fa = fetch --all
  pom = push origin master
  b = branch
  ds = diff --stat=160,120
  dh1 = diff HEAD~1

[format]
    pretty=format:%C(yellow)%h%Creset -%C(red)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset
[merge]
  summary = false
  keepBackup = false
  tool = p4merge
[mergetool "p4merge"]
  cmd = /Applications/p4merge.app/Contents/Resources/launchp4merge "$PWD/$BASE" "$PWD/$REMOTE" "$PWD/$LOCAL" "$PWD/$MERGED"
  keepTemporaries = false
  keepBackup = false
[diff]
  tool = p4merge
[difftool]
  prompt = false
[rerere]
  enabled = true
[push]
	default = tracking
[core]
	excludesfile = ~/.gitignore_global
	editor = nvim
	trustctime = false
[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

[branch]
  autosetupmerge=true