zsh: load btrfs and ip run-help functions

[dotfiles.git] / git / config

diff --git a/git/config b/git/config
index f3865cfbb01047d16baf99edafd4f7df1cd5b9c3..922f5e150383ec8a744ce50f3530fa89737b6ddc 100644 (file)
--- 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"]
@@ -29,3 +30,15 @@
 [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