.gitconfig

[user]
    name = Naia Bouscal
    email = nbouscal@gmail.com
[diff]
[color]
    ui = auto
[alias]
    st = status --short
    ci = commit
    co = checkout
    di = diff
    dc = diff --cached
    amend = commit --amend
    aa = add --all
    ff = merge --ff-only
    pullff = pull --ff-only
    noff = merge --no-ff
    fa = fetch --all
    pom = push origin master
    b = branch
    ds = diff --stat=160,120
    dh1 = diff HEAD~1

    head = !git l -1
    h = !git head
    hp = "!. ~/.githelpers && show_git_head"
    r = !git l -30
    ra = !git r --all
    l = "!. ~/.githelpers && pretty_git_log"
    la = !git l --all
    conflicts = !git diff --name-only --diff-filter=U | less -FXRS

[merge]
    tool = vimdiff
[core]
    editor = /usr/local/bin/vim
    excludesfile = /Users/naia/.gitignore
[push]
    default = simple
[rerere]
    enabled = true