.gitconfig

[user]
    name = Chris Petersen
[core]
    whitespace=fix,-indent-with-non-tab,trailing-space,cr-at-eol
    excludesfile = $HOME/.gitignore
[http]
    sslVerify = false
[branch]
    autosetupmerge = true
[push]
    default = tracking
[pull]
    default = rebase
[difftool "sourcetree"]
    cmd = opendiff \"$LOCAL\" \"$REMOTE\"
    path =
[merge]
    tool = vimdiff
[mergetool "sourcetree"]
    cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
    trustExitCode = true
[color]
    branch = auto
    diff = auto
    status = auto
    ui = true
[color "branch"]
    current = yellow reverse
    local = yellow
    remote = green
[color "diff"]
    meta = yellow bold
    frag = magenta bold
    old = red bold
    new = green bold
[color "grep"]
    context = normal
    filename = magenta
    function = cyan
    linenumber = green
    match = green
    selected = normal
    separator = cyan
[color "status"]
    added = green
    changed = yellow
    untracked = cyan
[alias]
    br = branch
    ci = commit
    co = checkout
    dc = diff --cached
    dif = diff
    mergenoff = merge --no-ff
    st = status
    stat = status
    # Cleanup
    cleanup = !git_cleanup # remove already-merged branches that have not changed in a month
    pruneall = "!git fetch origin --prune --tags -f; git remote prune origin"
    # Search/Log
    logn = log --decorate --name-status
    logp = log --patch
    new = "!git log $(ref=$(git symbolic-ref HEAD); echo $(git config -z --get branch.${ref##refs/heads/}.remote)/$(rbranch=$(git config --get branch.${ref##refs/heads/}.merge); echo ${rbranch##refs/heads/})).."
    only = !git_only
    wheres=branch -a --contains
    # branch per feature: https://rubygems.org/gems/git_bpf
    newqa="!_git-bpf recreate-branch qa"
    forceqa=push --force origin qa
[credential]
    helper = osxkeychain
[rerere]
    enabled = true