gitconfig

[user]
  name = travisyoes
  email = git@travisyoes.com
[color]
  branch = auto
  diff = auto
  status = auto
[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
[credential]
  helper = cache
[merge]
  tool = vimdiff
	conflictstyle = diff3
[diff]
  tool = meld
[difftool]
  prompt = false
[difftool "webstorm"]
  cmd = webstorm diff $(cd $(dirname "$LOCAL") && pwd)/$(basename "$LOCAL") $(cd $(dirname "$REMOTE") && pwd)/$(basename "$REMOTE")
  trustExitCode = true
[mergetool "webstorm"]
  cmd = webstorm merge $(cd $(dirname "$LOCAL") && pwd)/$(basename "$LOCAL") $(cd $(dirname "$REMOTE") && pwd)/$(basename "$REMOTE") $(cd $(dirname "$BASE") && pwd)/$(basename "$BASE") $(cd $(dirname "$MERGED") && pwd)/$(basename "$MERGED")
  trustExitCode = true
[core]
  autocrlf = input
  legacyheaders = false
  editor = vim
[gui]
  fontdiff = -family Monaco -size 12 -weight normal -slant roman -underline 0 -overstrike 0
[repack]
  usedeltabaseoffset = true
[alias]
  ci = commit
  co = checkout
  st = status
  br = branch
  ch = cherry -v origin
  mine = log --author=tyoes
  spull = !git svn fetch && git svn rebase
  spush = !git svn dcommit
  hist = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short
  type = cat-file -t
  dump = cat-file -p
  lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --
  prune-merged = !git branch --merged | grep -v \"\\*\" | xargs -n 1 git branch -d
  subpull = !git submodule foreach git pull --tags origin master
  history-search = "!git rev-list --all | xargs git grep"
[push]
	default = simple
[url "git@github.com:"]
	insteadOf = https://github.com/

[filter "remove-tokens"]
clean = "sed -e '/^_auth =.*/d' | sed -e '/^AuthSession =.*/d' | sed -e '/^expires =.*/d'"