diff --git a/dotfiles/.gitconfig b/dotfiles/.gitconfig
index 5c5ab13..83951fa 100644
--- a/dotfiles/.gitconfig
+++ b/dotfiles/.gitconfig
@@ -1,15 +1,27 @@
-[commit]
-	gpgsign = true
-
 [user]
 	email = kennel.anri@tutanota.com
 	name = Mylloon
 
-[pull]
-	rebase = false
+[commit]
+	gpgsign = true
 
 [init]
 	defaultBranch = main
 
+[pull]
+	rebase = false
+
+[remote "origin"]
+	prune = true
+
+[fetch]
+	pruneTags = true
+
+[push]
+	autoSetupRemote = true
+
+[merge]
+	conflictStyle = zdiff3
+
 [diff]
 	external = difft