mutt: fix F macro to not write message to home

[dotfiles.git] / git / config

diff --git a/git/config b/git/config
index 28e18e4c60974a901747fda1daa3475b270660ac..954a76ad484406ab36a2dcecca283b43b4394158 100644 (file)
--- a/git/config
+++ b/git/config
@@ -20,7 +20,7 @@
        smtpserver = /usr/bin/msmtp
        smtpuser = 
 [mergetool "fugitive"]
-       cmd = vim -f -c \"Gvdiff\" \"$MERGED\"
+       cmd = vim -f -c \"Gdiffsplit!\" \"$MERGED\"
 [merge]
        tool = fugitive
        defaultToUpstream = true
@@ -36,10 +36,19 @@
 [pull]
        rebase = interactive
 [branch "master"]
-       rebase = preserve
+       rebase = merges
 [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"
+       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