[user] name = R. Steve McKown email = rsmckown@gmail.com [color] ui = auto [alias] llog = log --date=local branches = !git for-each-ref --sort='-authordate' --format='%(authordate)\t%(objectname:short)\t%(refname)' refs/{heads,remotes} | sed -e 's|refs/heads/||' -e 's|refs/remotes/||' | less [log] decorate = true [diff] ; diff.tool kdiff3 useful for 'git diffall' tool = kdiff3 mnemonicprefix = true [difftool] prompt = false [merge] tool = vimdiff conflictstyle = diff3 [mergetool] prompt = false [push] default = simple [branch] autosetuprebase = always