.gitconfig

[core]
	autocrlf = false
	safecrlf = true
	editor = EDITOR=/usr/bin/vim
	editor = open -W -n
	editor = /usr/bin/vim
  excludesfile = ~/.gitignore
  attributesfile = ~/.gitattributes
[alias]
	hist = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short
  c = commit -am
  p = push
  s = status -s
  df = diff --color --color-words --abbrev
  lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold white)<%an>%Creset' --abbrev-commit --
  undo = reset --hard HEAD~1
  amend = commit --amend
  ms = merge staging
  md = merge develop
[color]
  ui = always
[color "branch"]
  current = yellow reverse
  local = yellow
  remote = green
[color "diff"]
  meta = yellow bold
  frag = magenta
  old = red bold
  new = green bold
[color "status"]
  added = yellow bold 
  changed = green
  untracked = cyan
[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
[merge]
  log = true
[user]
  name = James Styles
  email = james.styles@domain7.com