Change git colors to be closer to default.
Change vim diff colors to be closer to git.
highlight Type ctermfg=black guifg=black
highlight pythonExceptions ctermfg=darkred guifg=darkred
highlight Type ctermfg=black guifg=black
highlight pythonExceptions ctermfg=darkred guifg=darkred
+ if &diff
+ highlight DiffAdd ctermfg=green ctermbg=grey guifg=green guibg=grey90
+ highlight DiffChange ctermfg=black ctermbg=grey guifg=black guibg=grey90
+ highlight DiffDelete ctermfg=red ctermbg=grey guifg=red guibg=grey90
+ highlight DiffText ctermfg=white ctermbg=magenta guifg=white guibg=magenta
+ endif
+
if &filetype == 'mail'
highlight Statement cterm=none ctermfg=black gui=none guifg=black
highlight Type ctermfg=blue guifg=blue
if &filetype == 'mail'
highlight Statement cterm=none ctermfg=black gui=none guifg=black
highlight Type ctermfg=blue guifg=blue
highlight Type ctermfg=white guifg=white
highlight pythonExceptions ctermfg=red guifg=red
highlight Type ctermfg=white guifg=white
highlight pythonExceptions ctermfg=red guifg=red
+ if &diff
+ highlight DiffAdd ctermfg=green ctermbg=black guifg=green guibg=black
+ highlight DiffChange ctermfg=white ctermbg=black guifg=black guibg=black
+ highlight DiffDelete ctermfg=red ctermbg=black guifg=red guibg=black
+ highlight DiffText ctermfg=white ctermbg=magenta guifg=white guibg=magenta
+ endif
+
if &filetype == 'mail'
highlight Statement cterm=none ctermfg=white gui=none guifg=white
highlight Type cterm=bold gui=bold
if &filetype == 'mail'
highlight Statement cterm=none ctermfg=white gui=none guifg=white
highlight Type cterm=bold gui=bold
-[color "branch"]
- current = green
- local = normal
- plain = normal
- remote = magenta
+#[color "branch"]
+# current = green
+# local = normal
+# plain = normal
+# remote = red
+#[color "decorate"]
+# HEAD = cyan bold
+# tag = yellow bold
- commit = bold yellow
- frag = cyan
- meta = cyan
- new = green
- old = magenta
- plain = normal
- whitespace = normal red
-[color "grep"]
- match = normal
-[color "interactive"]
- error = normal
- header = normal
- help = normal
- prompt = normal
-[color "status"]
- added = cyan
- changed = magenta
- header = normal
- nobranch = red
- untracked = red
- updated = green
+# commit = yellow
+# frag = cyan
+ meta = blue
+# new = green
+# old = red
+# plain = normal
+# whitespace = normal red
+#[color "grep"]
+# match = normal
+#[color "interactive"]
+# error = normal
+# header = normal
+# help = normal
+# prompt = normal
+#[color "status"]
+# added = green
+# changed = red
+# header = normal
+# nobranch = red
+# untracked = red
+# updated = magenta
# Adapted from http://shallowsky.com/blog/programming/gitcolors.html
# and http://www.ansdb.com/649-git-colors-for-light-background
[color "branch"]
# Adapted from http://shallowsky.com/blog/programming/gitcolors.html
# and http://www.ansdb.com/649-git-colors-for-light-background
[color "branch"]
local = normal
plain = normal
local = normal
plain = normal
- remote = magenta
- upstream = normal
+ remote = red
+[color "decorate"]
+ HEAD = blue bold
+ tag = blue bold
- new = blue
- old = magenta
+ new = green
+ old = red
plain = normal
whitespace = normal red
plain = normal
whitespace = normal red
-[color "decorate"]
- HEAD = blue
- tag = blue
+#[color "grep"]
+# match = normal
+#[color "interactive"]
+# error = normal
+# header = normal
+# help = normal
+# prompt = normal
[color "status"]
added = blue
[color "status"]
added = blue
header = normal
nobranch = red
untracked = red
header = normal
nobranch = red
untracked = red