gitconfig

[user]
	name = Eric Mueller
	email = emueller@emcien.com

[core]
  editor = mvim
  whitespace = -trailing-space
  pager =
  excludesfile = /Users/nevinera/.gitignore

[alias]
  # current-branch = "!f() { B=$(git symbolic-ref HEAD) && echo ${B#refs/heads/}; }; f"
  # current-remote = "!f() { B=$(git config branch.$(git current-branch).remote) && echo ${B}; }; f"
  # current-merge  = "!f() { B=$(git config branch.$(git current-branch).merge) && echo ${B#refs/heads/}; }; f"
  # current-track  = "!f() { R=$(git current-remote) && M=$(git current-merge) && echo ${R}/${M}; }; f"
  remove         = "!f() { git ls-files --deleted -z $@ | xargs -0 git rm -r; }; f"
  addremove      = "!f() { git add -v ${@-.}; git remove $@; }; f"
  # incoming       = "!f() { T=$( [ \"${1}\" == \"\" ] && echo $(git current-track) || echo ${1} ) && git log ..${T}; }; f"
  # outgoing       = "!f() { T=$( [ \"${1}\" == \"\" ] && echo $(git current-track) || echo ${1} ) && git log ${T}..; }; f"
  # wip            = "!f() { git addremove $@; git commit -m 'Work in progress'; }; f"
  # unwip          = reset HEAD^
  merge-feature  = merge --no-ff
  last           = log -n
  staged         = diff --cached

[help]
  format = html
[rerere]
  enabled = 1
[color]
  ui = auto
[merge]
  tool = opendiff

[branch]
  autosetupmerge = true
  autosetuprebase = always

[push]
  default = current