[user] name = Samir Benmendil email = me@rmz.io [color] branch = auto status = auto ui = auto diff = auto [push] default = simple [diff] tool = vimdiff [color "diff"] new = cyan bold old = red bold meta = green [sendemail] smtpencryption = tls 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