X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/bca34e4ce53213a2405d2eae12451d334be59d4a..32a180d2d9ce65bca5e463d42c3e6d6ab918b8b7:/git/config?ds=inline diff --git a/git/config b/git/config index 922f5e1..266b579 100644 --- a/git/config +++ b/git/config @@ -17,11 +17,10 @@ meta = green [sendemail] smtpencryption = tls - smtpserver = smtp.gmail.com - smtpuser = samir.benmendil@gmail.com - smtpserverport = 587 + smtpserver = /usr/bin/msmtp + smtpuser = [mergetool "fugitive"] - cmd = vim -f -c \"Gvdiff\" \"$MERGED\" + cmd = vim -f -c \"Gdiffsplit!\" \"$MERGED\" [merge] tool = fugitive defaultToUpstream = true @@ -42,3 +41,11 @@ rebase = preserve [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