.gitconfig

[color]
  ui = auto

[user]
  name = JC Grubbs
  email = jc.grubbs@devmynd.com

[core]
  editor = vim

[alias]
  st = status
  a = add
  aa = add --all
  ci = "commit -m"
  br = branch
  track = branch --set-upstream-to
  co = checkout
  df = diff
  pr = pull --rebase
  lg = "!source ~/.githelpers && pretty_git_log"
  hist = log --pretty=format:\"%Cgreen%h%Creset %Cblue%ad%Creset %C(magenta)%cn%Creset%C(yellow)%d%Creset%n        %s\" --graph --date=local
  cp = cherry-pick
  diffs = diff --cached
  rp = remote prune
  rpo = remote prune origin
  gcp = gc --prune
  panic = !tar cvf ../git_panic.tar .
  pom = push origin master
  shown = show --pretty="format:" --name-only

[push]
  default = current

[difftool "Kaleidoscope"]
	cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[diff]
	tool = Kaleidoscope
[difftool]
	prompt = false
[mergetool "Kaleidoscope"]
	cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
	trustExitCode = true
[mergetool]
	prompt = false
[merge]
	tool = Kaleidoscope