zsh: load btrfs and ip run-help functions

[dotfiles.git] / git / config

diff --git a/git/config b/git/config
index bfbfc4c93ba4862057d6766642f54e8bcd8758da..922f5e150383ec8a744ce50f3530fa89737b6ddc 100644 (file)
--- a/git/config
+++ b/git/config
@@ -1,13 +1,14 @@
 [user]
        name = Samir Benmendil
 [user]
        name = Samir Benmendil

-       email = samir.benmendil@gmail.com
+       email = me@rmz.io

 [color]
        branch = auto
        status = auto
        ui = auto
        diff = auto
 [push]
 [color]
        branch = auto
        status = auto
        ui = auto
        diff = auto
 [push]

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

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


@@ -19,3 +20,25 @@
        smtpserver = smtp.gmail.com
        smtpuser = samir.benmendil@gmail.com
        smtpserverport = 587
        smtpserver = smtp.gmail.com
        smtpuser = samir.benmendil@gmail.com
        smtpserverport = 587

+[mergetool "fugitive"]
+       cmd = vim -f -c \"Gvdiff\" \"$MERGED\"
+[merge]
+       tool = fugitive
+       defaultToUpstream = true
+[mergetool]
+       prompt = no
+[rebase]
+       autostash = true
+       autosquash = true
+[status]
+       submodulesummary = true
+[rerere]
+       enabled = true
+[pull]
+       rebase = interactive
+[branch "master"]
+       rebase = preserve
+[branch "develop"]
+       rebase = preserve
+[commit]
+       verbose = true