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

[dotfiles.git] / git / config

diff --git a/git/config b/git/config
index 926e1fb44a884abd7ad5eef19b2825c4d0869d82..9e82d98497439ca730a548213e246b3d182135da 100644 (file)
--- a/git/config
+++ b/git/config
@@ -11,6 +11,8 @@
        recurseSubmodules = check
 [diff]
        tool = vimdiff
+[diff "gpg"]
+       textconv = gpg --quiet --decrypt --use-agent
 [color "diff"]
        new = cyan bold
        old = red bold
@@ -37,6 +39,8 @@
        enabled = true
 [pull]
        rebase = interactive
+[branch]
+       autoSetupMerge = inherit
 [branch "master"]
        rebase = merges
 [branch "develop"]
@@ -54,3 +58,5 @@
 
 [includeIf "gitdir:~/src/fpp/**"]
        path = ~/.config/git/fpp.config
+[credential]
+       helper = cache