nvim: allow normal mode in lsp.rename() popup

[dotfiles.git] / git / config

diff --git a/git/config b/git/config
index a759c2e95004ba4e0c18886c1f912ced60fb8388..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"]
@@ -56,3 +58,5 @@
 
 [includeIf "gitdir:~/src/fpp/**"]
        path = ~/.config/git/fpp.config
+[credential]
+       helper = cache