nvim: do not override gr keymap

[dotfiles.git] / git / config

diff --git a/git/config b/git/config
index f3865cfbb01047d16baf99edafd4f7df1cd5b9c3..8f78436ffe94d24443dc3ba9116c24065f96208e 100644 (file)
--- a/git/config
+++ b/git/config
@@ -7,25 +7,54 @@
        ui = auto
        diff = auto
 [push]
        ui = auto
        diff = auto
 [push]

-       default = simple
+       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]
+       enabled = true
+[pull]
+       rebase = interactive
+[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