diff --git a/.gitconfig b/.gitconfig
index 3989f4e..30519b2 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -16,8 +16,6 @@
 	grep = auto
 	interactive = auto
 	ui = auto
-[help]
-	autocorrect = 1
 [push]
 	default = matching
 [core]
@@ -25,3 +23,5 @@
 	editor = mate -wl1
 [github]
 	user = meineerde
+[branch]
+	autosetupmerge = true