.gitconfig

# TODO: https://github.com/rtomayko/dotfiles/blob/rtomayko/.gitconfig
# TODO: http://stackoverflow.com/questions/267761/what-does-your-gitconfig-contain

[include]
  path = .gitconfig.khan

[core]
  editor = /usr/bin/vim  # http://tooky.github.com/2010/04/08/there-was-a-problem-with-the-editor-vi-git-on-mac-os-x.html
  whitespace = trailing-space,space-before-tab  # http://stackoverflow.com/questions/591923/make-git-automatically-remove-trailing-whitespace-before-committing
  excludesfile = ~/.gitignore_global

[user]
  name = David Hu
  email = davidhu91@gmail.com

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

[branch]
  # auto-adds the --track flag to git branch. Helps out arc (for Phabricator).
  autosetupmerge = always

[alias]
  ;co = checkout
  graph = log --graph --decorate --oneline --pretty=format:"%h%x20%Cgreen%d%x20%Cred%an%x20%Cblue%ad%x20%Creset%s" --all --full-history --date=short
  slog = log --oneline --pretty=format:"%h%x20%x20%Cred%an%x20%Cblue%ad%x20%Creset%s" --date=short
  st = status
  ci = commit
  co = checkout
  br = branch
  df = diff
  pr = pull --rebase
  cam = commit -a --amend -C HEAD
  p = pull
  m = merge
  dfs = diff --staged
  ls-ignored = ls-files --exclude-standard --ignored --others
  lp = log -p
  bw = blame -w  # Ignore whitespace changes
  outgoing = log origin/master..HEAD
  incoming = "!git fetch $1; git log HEAD..$1/master"
  ack = grep --break --heading --context 3 --ignore-case --line-number

[apply]
  whitespace = fix  # http://stackoverflow.com/questions/591923/make-git-automatically-remove-trailing-whitespace-before-committing

[merge]
  tool = opendiff

  # Always show a diffstat at the end of a merge
	stat = true

[rebase]
  # Always show a diffstat at the end of a rebase
  stat = true

[diff]
  # Use mnemonic prefixes (index, work tree, commit, object) instead of the standard a and b notation
	mnemonicprefix = true

  # Detect renames as well as copies
	renames = copies

[push]
  # when pushing without specifying a branch, only current branch will be pushed to the one git pull would normally get code from
	default = simple
[init]
	templatedir = /Users/david/.git-templates
[kaclone]
	email = david@khanacademy.org