diff --git a/.gitconfig b/.gitconfig
index bfd190b..4b3b68e 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -2,6 +2,12 @@
 	editor = nvim
 	symlinks = true
 
+[push]
+	default = simple
+
+[pull]
+	rebase = true
+
 [alias]
 	st = status
 	ci = commit --verbose