X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/9c2d6207d41a80c9438aae9de4547c196f79cedf..0a4c55b1ca308b27989b49f56851a4d1ee99a60f:/git/config?ds=sidebyside

diff --git a/git/config b/git/config
index 0e41b1f..922f5e1 100644
--- a/git/config
+++ b/git/config
@@ -7,7 +7,8 @@
 	ui = auto
 	diff = auto
 [push]
-	default = simple
+	default = current
+	recurseSubmodules = check
 [diff]
 	tool = vimdiff
 [color "diff"]
@@ -31,3 +32,13 @@
 	autosquash = true
 [status]
 	submodulesummary = true
+[rerere]
+	enabled = true
+[pull]
+	rebase = interactive
+[branch "master"]
+	rebase = preserve
+[branch "develop"]
+	rebase = preserve
+[commit]
+	verbose = true