[core] editor = emacsclient --alternate-editor= --reuse-frame [user] name = "Martin Michalec" email = "martin@michalec.dev" signingkey = "EC8B9BEEC52ADE94D44F9F1649D78C69C2FCBB11" [merge] conflictStyle = diff3 [diff] algorithm = histogram [commit] gpgsign = true [sendemail] annotate = true [pull] rebase = true [advice] detachedHead = false [sendemail] sendmailcmd = msmtp --read-envelope-from