weechat: update plugins

[dotfiles.git] / git / config

diff --git a/git/config b/git/config
index 2892abba270bfc37bb2f1af588dfdadddbea7d0c..deadf5c5bde2388ac2f7b104106c853270af0c46 100644 (file)
--- a/git/config
+++ b/git/config
@@ -7,7 +7,7 @@
        ui = auto
        diff = auto
 [push]
        ui = auto
        diff = auto
 [push]

-       default = simple
+       default = current

 [diff]
        tool = vimdiff
 [color "diff"]
 [diff]
        tool = vimdiff
 [color "diff"]


@@ -33,3 +33,9 @@
        submodulesummary = true
 [rerere]
        enabled = true
        submodulesummary = true
 [rerere]
        enabled = true

+[pull]
+       rebase = interactive
+[branch "master"]
+       rebase = preserve
+[branch "develop"]
+       rebase = preserve