gitconfig

[user]
  name = Greg Vaughn
  # prefer to keep email in individual repos' config
  # Use GIT_AUTHOR_EMAIL env var to override
[push]
  default = tracking
[alias]
  up = add -u
  hist = log  --pretty=format:'%Cred%h%Creset %C(yellow)%ad%Creset | %s%Cgreen%d %Cblue[%an]%Creset' --graph --date=short
  mhist = log  --pretty=format:'%Cred%h%Creset %C(yellow)%ad%Creset | %s%Cgreen%d %Cblue[%an]%Creset' --graph --date=short --author greg.vaughn
  g = log --oneline --all --graph --decorate --color
  ll = log ORIG_HEAD..HEAD --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short
  lol = log --graph --decorate --pretty=oneline --abbrev-commit
  so = commit -v --amend --signoff
  peek = show --name-only 
  changed = !git log --pretty="format:" --name-only head ORIG_HEAD..HEAD | sort | uniq
  yamldelta = !git log --pretty="format:" --name-only head $LASTHEAD..$CURHEAD | sort | uniq | grep ".*locales/deals.*yml"
  headsha = rev-parse head
  amend = !git commit --amend -C HEAD --date \"`date`\"
  co = checkout
  br = branch
  ci = commit
  st = status
  cl = checkout @{-1} # checkout last branch
  bdiff = !git diff `git merge-base HEAD origin/master` #diff of branch back to branch point
  unstage = reset HEAD --
  last = log -1 HEAD
  sync = "!f() { echo syncing with master && git checkout master && git pull && git checkout - && git rebase master; }; f"
  pruneall = "!f() { git remote | xargs -n 1 git remote prune; }; f"
  rtree = ls-tree -r -t master^{tree}
  prs= "!f() { open http://svn.livingsocial.com/dashboard/pulls; }; f"
  ctags = !.git/hooks/ctags
  fixup = "!f() { git commit --amend -C HEAD --date \"`date`\"; }; f"
  mru = "!f() { git for-each-ref --format='%(authordate:relative)%09%(refname:short)%0a%(subject)%0a' --sort=-committerdate refs/heads | head -20; }; f"
       #newpr= "!f() { open http://svn.livingsocial.com/$(git config --get github.user)/deals/pull/new/$(git symbolic-ref head | sed -e 's/.*\///g'); }; f"
[color]
  ui = true
[color "branch"]
  current = yellow reverse
  local = yellow
  remote = green
[color "diff"]
  meta = yellow bold
  frag = magenta bold
  old = red bold
  new = green bold
[color "status"]
  added = yellow
  changed = green
  untracked = cyan
[core]
  editor = /usr/bin/vim
  excludesfile = ~/.gitignore_global
[rerere]
  enabled = true
[branch]
  autosetuprebase = always
[hub]
  host = code.livingsocial.net
[credential]
	helper = osxkeychain
[init]
	templatedir = ~/dotfiles/git_template
[diff]
	algorithm = patience
[mergetool]
	keepBackup = false