.vim: vim-plug @e300178

[dotfiles.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index d45b6ef6f2f13f71373642c806076726dbec01d5..9cb3982584153ec0558231b0e615ec2a849680fe 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -61,6 +61,7 @@
        ui = auto
 
 [color "diff"]
+       plain = 241
        meta = blue bold
        frag = magenta bold
        old = red bold
@@ -83,9 +84,13 @@
 
 [color "diff-highlight"]
        oldNormal = nobold
-       oldHighlight = red bold
+       oldHighlight = red bold 235
        newNormal = nobold
-       newHighlight = green bold
+       newHighlight = green bold black
+
+[pull]
+       rebase = false
+       ff = only
 
 [push]
        default = matching