[user] email = d@drobilla.net name = David Robillard [merge] conflictstyle = zdiff3 [pull] ff = only [init] defaultBranch = main [rerere] enabled = true autoupdate = true [diff] colorMoved = plain mnemonicPrefix = true renames = true algorithm = histogram [tag] sort = version:refname [branch] sort = -committerdate [advice] mergeConflict = false