qutebrowser: also cycle through accept all cookies

[dotfiles.git] / git / config

diff --git a/git/config b/git/config
index 954a76ad484406ab36a2dcecca283b43b4394158..af16e937188de5daaa693c794629faf51a7dfa5c 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
@@ -24,11 +26,13 @@
 [merge]
        tool = fugitive
        defaultToUpstream = true
+       conflictstyle = diff3
 [mergetool]
        prompt = no
 [rebase]
        autostash = true
        autosquash = true
+       stat = true
 [status]
        submodulesummary = true
 [rerere]
@@ -50,5 +54,5 @@
        process = git-lfs filter-process
        required = true
 
-[includeIf "gitdir:~/src/fpp/**"]
-       path = ~/.config/git/fpp.config
+[includeIf "gitdir:~/src/wio/**"]
+       path = ~/.config/git/wio.config