[user] name = {{ .username }} email = {{ .email }} [push] default = simple [commit] verbose = true [init] defaultBranch = main [pull] ff = only [column] ui = auto [branch] sort = -committerdate [tag] sort = version:refname [diff] algorithm = histogram colorMoved = plain mnemonicPrefix = true renames = true [fetch] prune = true pruneTags = true [rebase] updateRefs = true [merge] {{- if eq .chezmoi.hostname "ftpserver" }} conflictstyle = diff3 {{- else }} conflictstyle = zdiff3 {{ end }}