git: verbose commit

[dotfiles.git] / git / config

diff --git a/git/config b/git/config
index 1c5b482339fc048e2548fc93b43e20da3afb3118..f7e4f4053351d4b21bdbdb2471d7d80778883125 100644 (file)
--- a/git/config
+++ b/git/config
@@ -7,7 +7,7 @@
        ui = auto
        diff = auto
 [push]
-       default = simple
+       default = current
 [diff]
        tool = vimdiff
 [color "diff"]
@@ -32,4 +32,12 @@
 [status]
        submodulesummary = true
 [rerere]
-       enable = true
+       enabled = true
+[pull]
+       rebase = interactive
+[branch "master"]
+       rebase = preserve
+[branch "develop"]
+       rebase = preserve
+[commit]
+       verbose = true