[user] name = Charles email = sircharlesaze@gmail.com [log] decorate = full [pull] rebase = false [merge] tool = vimdiff