qutebrowser: wait for wezterm to exit when running commands

[dotfiles.git] / git / config

diff --git a/git/config b/git/config
index af16e937188de5daaa693c794629faf51a7dfa5c..9e82d98497439ca730a548213e246b3d182135da 100644 (file)
--- a/git/config
+++ b/git/config
@@ -39,6 +39,8 @@
        enabled = true
 [pull]
        rebase = interactive
+[branch]
+       autoSetupMerge = inherit
 [branch "master"]
        rebase = merges
 [branch "develop"]
@@ -54,5 +56,7 @@
        process = git-lfs filter-process
        required = true
 
-[includeIf "gitdir:~/src/wio/**"]
-       path = ~/.config/git/wio.config
+[includeIf "gitdir:~/src/fpp/**"]
+       path = ~/.config/git/fpp.config
+[credential]
+       helper = cache