.gitconfig

#GistID:9531777
[user]
	name = Alexander Jeurissen
	email = [email protected]
[diff]
  external = git_diff_wrapper
[pager]
  diff =
[color]
 ui = auto
[alias]
  lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %Cblue<%an>%Creset' --abbrev-commit --date=relative
  lgo = log --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %Cblue<%an>%Creset' --date=relative
  d = diff
  ;branch navigation aliases
  ch = checkout
  b = branch

  ;rebase aliases
  ri = rebase -i
  r = rebase
  rc = rebase --continue
  ra = rebase --abort
  rs = rebase --skip

  ;merge aliases
  m = merge
  mc = merge --continue
  ma = merge --abort

  ; push/commit aliases
  aa = add -A
  unadd = reset HEAD
  c = commit
  p = push

  ; stash aliases
  stash = stash -u
  sp = stash pop
  sb = stash branch

[merge]
    tool = threesome
[mergetool "threesome"]
    cmd = "vim -f $BASE $LOCAL $REMOTE $MERGED -c 'ThreesomeInit'"
    trustExitCode = true
# vim: set et :
[credential]
	helper = cache --timeout=36000
[github]
	user = alexanderjeurissen
[core]
	excludesfile = /Users/alexander/.gitignore
	editor = vim
[push]
	default = simple
[difftool "sourcetree"]
	cmd = opendiff \"$LOCAL\" \"$REMOTE\"
	path =
[mergetool "sourcetree"]
	cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
	trustExitCode = true