[user] name = R. Steve McKown email = rsmckown@gmail.com [color] ui = auto [alias] llog = log --date=local [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 [heads] dfltargs = -a -b --author-date-order \"--format=format:%C(auto)%ad %h%d\"