.gitconfig

[user]
  name = Alex Okolish
  email = alex.okolish@gmail.com
[alias]
  st = status -sb
  ci = commit
  co = checkout
  di = diff
  dc = diff --cached
  ds = diff --stat=160,120
  pom = push origin master
  amend = commit --amend
  aa = add --all
  recent = for-each-ref --sort=-committerdate refs/heads/ --format='%(refname:short)'
  find-merge = "!sh -c 'commit=$0 && branch=${1:-HEAD} && (git rev-list $commit..$branch --ancestry-path | cat -n; git rev-list $commit..$branch --first-parent | cat -n) | sort -k2 | uniq -f1 -d | sort -n | tail -1 | cut -f2'"
  show-merge = "!sh -c 'merge=$(git find-merge $0 $1) && [ -n \"$merge\" ] && git show $merge'"

  # fancy logging stuff
  head = !git l -1
  h = !git head
  hp = "!. ~/.githelpers && show_git_head"
  l = "!source ~/.githelpers && pretty_git_log"
  la = !git l --all
  r = !git l -30
  ra = !git r --all
[color]
  diff = auto
  status = auto
  branch = auto
[core]
  excludesfile = ~/.gitignore_global
  editor = vim
  autocrlf = input
[apply]
  whitespace = nowarn
[help]
  autocorrect = 1
[push]
  default = simple
[interactive]
	diffFilter = diff-highlight
[pager]
	log = diff-highlight | less
	show = diff-highlight | less
	diff = diff-highlight | less
[commit]
	verbose = true
[includeIf "gitdir:~/src/"]
  path = ~/.gitconfig-work
[pull]
	rebase = true
[init]
	templatedir = ~/.git_template