ui = auto
diff = auto
[push]
- default = simple
+ default = current
+ recurseSubmodules = check
[diff]
tool = vimdiff
[color "diff"]
prompt = no
[rebase]
autostash = true
+ autosquash = true
+[status]
+ submodulesummary = true
+[rerere]
+ enabled = true
+[pull]
+ rebase = interactive
+[branch "master"]
+ rebase = preserve
+[branch "develop"]
+ rebase = preserve
+[commit]
+ verbose = true