lazyvim: absorb keymaps

[dotfiles.git] / git / config

diff --git a/git/config b/git/config
index bfbfc4c93ba4862057d6766642f54e8bcd8758da..406c28c44e829b16ff2e32e110f73a5d5ef7db63 100644 (file)
--- a/git/config
+++ b/git/config
@@ -1,21 +1,65 @@
 [user]
        name = Samir Benmendil
-       email = samir.benmendil@gmail.com
+       email = me@rmz.io
 [color]
        branch = auto
        status = auto
        ui = auto
        diff = auto
 [push]
-       default = simple
+       default = current
+       recurseSubmodules = check
 [diff]
        tool = vimdiff
+[diff "gpg"]
+       textconv = gpg --quiet --decrypt --use-agent
 [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"]
+       cmd = nvim -f -c \"Gdiffsplit!\" \"$MERGED\"
+[merge]
+       tool = fugitive
+       defaultToUpstream = true
+       conflictstyle = diff3
+[mergetool]
+       prompt = no
+[rebase]
+       autostash = true
+       autosquash = true
+       stat = true
+       updateRefs = true
+       rescheduleFailedExec = true
+[status]
+       submodulesummary = true
+[rerere]
+       enabled = true
+[pull]
+       rebase = interactive
+[branch]
+       autoSetupMerge = inherit
+       sort = -committerdate
+[branch "master"]
+       rebase = merges
+[branch "develop"]
+       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
+[credential]
+       helper = cache