tmux: reduce esc+<key> timeout

[dotfiles.git] / git / config

diff --git a/git/config b/git/config
index 8f78436ffe94d24443dc3ba9116c24065f96208e..04367fe1f120b0eccb96824a56d02a3240f94b7d 100644 (file)
--- a/git/config
+++ b/git/config
@@ -33,12 +33,15 @@
        autostash = true
        autosquash = true
        stat = true
+       updateRefs = true
 [status]
        submodulesummary = true
 [rerere]
        enabled = true
 [pull]
        rebase = interactive
+[branch]
+       autoSetupMerge = inherit
 [branch "master"]
        rebase = merges
 [branch "develop"]