gitconfig

# -*- mode: conf -*-
[user]
    name = Cameron Higby-Naquin
    email = me@chigby.org
    signingkey = 7859F83F
[alias]
    co = checkout
    st = status
    dc = diff --cached
    ci = commit
    di = diff
    pl = pull --ff-only
    fa = fetch --all
    ff = merge --ff-only
    noff = merge --no-ff
    pf = push --force-with-lease

    # Logging
    r = !GIT_NO_PAGER=1 git l -25
    l = "!. ~/.githelpers && pretty_git_log"
    la = !git l --all

    head = !git r -1
    h = !git head
    hp = "!. ~/.githelpers && show_git_head"

    tidy = !git remote prune origin && git branch -r --merged master | grep -v 'master$' | grep -v feature | sed 's%origin/%%' | xargs -I% git push origin :% && git branch --merged master | grep -v 'master$' | grep -v feature | xargs git branch -d
    tidy-dryrun = !git remote prune --dry-run origin && git branch -r --merged master | grep -v 'master$' | grep -v feature | sed 's%origin/%%' | xargs -I% echo [remote] % && git branch --merged master | grep -v 'master$' | grep -v feature | xargs -I% echo [local] %

[core]
    editor = emacsclient
    pager = diff-highlight | less -r
[color]
    ui = true
[push]
    default = simple
[diff]
    compactionHeuristic = true
[interactive]
    diffFilter = diff-highlight
[commit]
    gpgSign = true
[rerere]
    enabled = true
[merge]
    conflictStyle = diff3