.gitconfig

# cool git aliases from Larry Defauw
[user]
    name = David Goade
    email = dgoade@gmail.com
[core]
    autocrlf = false
[alias]
    co = checkout
    ci = commit
    st = status
    br = branch
    la = log --graph --all --color --decorate --oneline
    lo = log --graph --all --color --decorate --oneline
    lob = log --graph --color --decorate --oneline
    ll = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%ci) %C(bold blue)<%an>%Creset'
    hist = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short
    update = !git pull && git submodule update --init --recursive
[push]
    default = simple
[credential]
    helper = wincred
[diff]
#        external = git-meld
[color]
    diff = auto
    ui = auto
[color "diff"]
    whitespace = red reverse
[merge]
    tool = meld
[merge "ours"]
    driver = true