diff --git a/gitconfig b/gitconfig
index 19c9aeb..0aedc74 100644
--- a/gitconfig
+++ b/gitconfig
@@ -7,16 +7,23 @@
 
 [core]
 	excludesfile = ~/.git-global-ignores
+	editor = vim
+	filemode = true
 	autocrlf = false
 	pager = less -FRX
 
+[branch]
+	autosetuprebase = remote
+	autosetupmerge = true
+	mergeoptions = --no-commit --no-ff
+
 [daemon]
 	uploadpack = true
 	uploadarch = true
 	receivepack = true
 
 [push]
-	default = matching
+	default = current
 
 [color]
 	ui = auto
@@ -77,7 +84,6 @@
 
 	logv = log --name-status
 
-
 [clean]
 	requireForce = false