mpv: don't ignore vp9 codecs

[dotfiles.git] / git / config

diff --git a/git/config b/git/config
index deadf5c5bde2388ac2f7b104106c853270af0c46..a759c2e95004ba4e0c18886c1f912ced60fb8388 100644 (file)
--- a/git/config
+++ b/git/config
@@ -8,27 +8,31 @@
        diff = auto
 [push]
        default = current
        diff = auto
 [push]
        default = current

+       recurseSubmodules = check

 [diff]
        tool = vimdiff
 [diff]
        tool = vimdiff

+[diff "gpg"]
+       textconv = gpg --quiet --decrypt --use-agent

 [color "diff"]
        new = cyan bold
        old = red bold
        meta = green
 [sendemail]
        smtpencryption = tls
 [color "diff"]
        new = cyan bold
        old = red bold
        meta = green
 [sendemail]
        smtpencryption = tls

-       smtpserver = smtp.gmail.com
-       smtpuser = samir.benmendil@gmail.com
-       smtpserverport = 587
+       smtpserver = /usr/bin/msmtp
+       smtpuser = 

 [mergetool "fugitive"]
 [mergetool "fugitive"]

-       cmd = vim -f -c \"Gvdiff\" \"$MERGED\"
+       cmd = vim -f -c \"Gdiffsplit!\" \"$MERGED\"

 [merge]
        tool = fugitive
        defaultToUpstream = true
 [merge]
        tool = fugitive
        defaultToUpstream = true

+       conflictstyle = diff3

 [mergetool]
        prompt = no
 [rebase]
        autostash = true
        autosquash = true
 [mergetool]
        prompt = no
 [rebase]
        autostash = true
        autosquash = true

+       stat = true

 [status]
        submodulesummary = true
 [rerere]
 [status]
        submodulesummary = true
 [rerere]


@@ -36,6 +40,19 @@
 [pull]
        rebase = interactive
 [branch "master"]
 [pull]
        rebase = interactive
 [branch "master"]

-       rebase = preserve
+       rebase = merges

 [branch "develop"]
 [branch "develop"]

-       rebase = preserve
+       rebase = merges
+[commit]
+       verbose = true
+[alias]
+       remote-to-ssh = "!f(){ local r=$1; git remote set-url $r $(git remote get-url $r | sed -r 's,https?://([^/]+),git@\\1:,'); };f"
+       clean-orig = "!git ls-files -o --exclude-standard | grep '\\.orig$' | xargs -n100 -p rm"
+[filter "lfs"]
+       clean = git-lfs clean -- %f
+       smudge = git-lfs smudge -- %f
+       process = git-lfs filter-process
+       required = true
+
+[includeIf "gitdir:~/src/fpp/**"]
+       path = ~/.config/git/fpp.config