[user] email = bs.of.dth@gmail.com name = Andrew Swistak [push] default = simple [merge] tool = vimdiff conflictstyle = diff3 summary = true [interactive] singlekey = true [mergetool] prompt = false [core] editor = vim -f [mergetool] prompt = false [alias] lol = log --oneline c = commit s = status cam = commit -am cane = commit --amend --no-edit cm = commit -m ca = commit -a d = diff ch = checkout [diff] tool = vimdiff [color] ui = auto diff = auto status = auto branch = auto interactive = auto grep = auto