nvim/keymaps: even better indenting

[dotfiles.git] / git / config

diff --git a/git/config b/git/config
index 28e18e4c60974a901747fda1daa3475b270660ac..8f78436ffe94d24443dc3ba9116c24065f96208e 100644 (file)
--- a/git/config
+++ b/git/config
@@ -11,6 +11,8 @@
        recurseSubmodules = check
 [diff]
        tool = vimdiff
        recurseSubmodules = check
 [diff]
        tool = vimdiff

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

 [color "diff"]
        new = cyan bold
        old = red bold
 [color "diff"]
        new = cyan bold
        old = red bold


@@ -20,15 +22,17 @@
        smtpserver = /usr/bin/msmtp
        smtpuser = 
 [mergetool "fugitive"]
        smtpserver = /usr/bin/msmtp
        smtpuser = 
 [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,10 +40,21 @@
 [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"
 [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
+[credential]
+       helper = cache