[user] name = Tristan Williams email = tgwil@tgwil.net username = tgwil [include] # .gitconfig.local used for GPG secret only path = ~/.gitconfig.local [core] editor = emacsclient autocrlf = input [commit] gpgsign = true verbose = true [init] defaultBranch = stable [merge] conflictstyle = zdiff3 [diff] algorithm = histogram context = 5 [log] date = iso [gpg] program = gpg2 [safe] directory = *