match diff colors with vim syntax colors + decorate logs

diff --git a/gitconfig b/gitconfig
index 118d7aa7a63c6f1b088a3ec56b3d6997faf4b491..5156708ff737371c4a11a80cad419b8070afa48c 100644 (file)
--- a/gitconfig
+++ b/gitconfig
@@ -12,3 +12,7 @@
        default = simple
 [diff]
        tool = vimdiff
        default = simple
 [diff]
        tool = vimdiff

+[color "diff"]
+       new = cyan bold
+       old = red bold
+       meta = green

diff --git a/zsh/aliases/git.zsh b/zsh/aliases/git.zsh
index 154aa6db1a4d686c65be2c4931c40eaac4d6bd8d..64c7d0cb172ff536ab7cef8e1a49815ba74ef758 100644 (file)
--- a/zsh/aliases/git.zsh
+++ b/zsh/aliases/git.zsh
@@ -40,9 +40,9 @@ compdef gcount=git
 alias gcl='git config --list'
 alias gcp='git cherry-pick'
 compdef _git gcp=git-cherry-pick
 alias gcl='git config --list'
 alias gcp='git cherry-pick'
 compdef _git gcp=git-cherry-pick

-alias glg='git log --stat --max-count=5'
+alias glg='git log --stat --max-count=5 --decorate'

 compdef _git glg=git-log
 compdef _git glg=git-log

-alias glgg='git log --graph --max-count=5'
+alias glgg='git log --graph --max-count=5 --decorate'

 compdef _git glgg=git-log
 alias glgga='git log --graph --decorate --all'
 compdef _git glgga=git-log
 compdef _git glgg=git-log
 alias glgga='git log --graph --decorate --all'
 compdef _git glgga=git-log