1 files changed, 23 insertions, 0 deletions
diff --git a/git/.gitconfig b/git/.gitconfig
new file mode 100644
index 0000000..b5e501d
--- /dev/null
+++ b/git/.gitconfig
@@ -0,0 +1,23 @@
+[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