mpv: don't ignore vp9 codecs

[dotfiles.git] / git / config

diff --git a/git/config b/git/config
index 6e0ef152045893cae3c7634c8f4a4981a6b26521..a759c2e95004ba4e0c18886c1f912ced60fb8388 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
@@ -20,15 +22,17 @@
        smtpserver = /usr/bin/msmtp
        smtpuser = 
 [mergetool "fugitive"]
-       cmd = vim -f -c \"Gvdiff\" \"$MERGED\"
+       cmd = vim -f -c \"Gdiffsplit!\" \"$MERGED\"
 [merge]
        tool = fugitive
        defaultToUpstream = true
+       conflictstyle = diff3
 [mergetool]
        prompt = no
 [rebase]
        autostash = true
        autosquash = true
+       stat = true
 [status]
        submodulesummary = true
 [rerere]
@@ -36,9 +40,9 @@
 [pull]
        rebase = interactive
 [branch "master"]
-       rebase = preserve
+       rebase = merges
 [branch "develop"]
-       rebase = preserve
+       rebase = merges
 [commit]
        verbose = true
 [alias]
@@ -49,3 +53,6 @@
        smudge = git-lfs smudge -- %f
        process = git-lfs filter-process
        required = true
+
+[includeIf "gitdir:~/src/fpp/**"]
+       path = ~/.config/git/fpp.config