diff --git a/dotfiles/git/.gitconfig b/dotfiles/git/.gitconfig
index 1ae22e5..5c417b4 100644
--- a/dotfiles/git/.gitconfig
+++ b/dotfiles/git/.gitconfig
@@ -11,3 +11,13 @@
 	gpgsign = true
 [tag]
 	gpgSign = true
+[pull]
+	rebase = false
+[gui]
+	pruneduringfetch = true
+[smartgit "submodule"]
+	fetchalways = false
+	update = true
+	initializenew = true
+[push]
+	recurseSubmodules = check