tmux: reduce esc+<key> timeout

[dotfiles.git] / git / config

diff --git a/git/config b/git/config
index a759c2e95004ba4e0c18886c1f912ced60fb8388..04367fe1f120b0eccb96824a56d02a3240f94b7d 100644 (file)
--- a/git/config
+++ b/git/config
@@ -33,12 +33,15 @@
        autostash = true
        autosquash = true
        stat = true
        autostash = true
        autosquash = true
        stat = true

+       updateRefs = true

 [status]
        submodulesummary = true
 [rerere]
        enabled = true
 [pull]
        rebase = interactive
 [status]
        submodulesummary = true
 [rerere]
        enabled = true
 [pull]
        rebase = interactive

+[branch]
+       autoSetupMerge = inherit

 [branch "master"]
        rebase = merges
 [branch "develop"]
 [branch "master"]
        rebase = merges
 [branch "develop"]


@@ -56,3 +59,5 @@
 
 [includeIf "gitdir:~/src/fpp/**"]
        path = ~/.config/git/fpp.config
 
 [includeIf "gitdir:~/src/fpp/**"]
        path = ~/.config/git/fpp.config

+[credential]
+       helper = cache