add multiple config for git

2024-02-18 14:01:52 +01:00 · 2024-02-18 14:01:52 +01:00 · db76a79594
commit db76a79594
parent 054e5983fa
1 changed files with 17 additions and 5 deletions
--- 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