[user] email = bs.of.dth@gmail.com name = Andrew Swistak [push] default = simple [merge] tool = gvimdiff conflictstyle = diff3 [core] editor = mvim -f [mergetool] prompt = false tool = gvimdiff [diff] tool = gvimdiff [alias] lol = log --oneline c = commit s = status cam = commit -am cm = commit -m ca = commit -a d = diff ch = checkout [difftool "gvimdiff"] path = mvim [mergetool "gvimdiff"] path = mvim