mutt: fix F macro to not write message to home

[dotfiles.git] / git / config

diff --git a/git/config b/git/config
index 2892abba270bfc37bb2f1af588dfdadddbea7d0c..954a76ad484406ab36a2dcecca283b43b4394158 100644 (file)
--- a/git/config
+++ b/git/config
@@ -7,7 +7,8 @@
        ui = auto
        diff = auto
 [push]
        ui = auto
        diff = auto
 [push]

-       default = simple
+       default = current
+       recurseSubmodules = check

 [diff]
        tool = vimdiff
 [color "diff"]
 [diff]
        tool = vimdiff
 [color "diff"]


@@ -16,11 +17,10 @@
        meta = green
 [sendemail]
        smtpencryption = tls
        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


@@ -33,3 +33,22 @@
        submodulesummary = true
 [rerere]
        enabled = true
        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