[user]
-       email = ram-z@chakra-project.org
        name = Samir Benmendil
+       email = samir.benmendil@gmail.com
 [core]
        excludesfile = /home/ramsi/.gitignore_global
-[alias]
 [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