git: difftool

Signed-off-by: Michael Grote <michael.grote@dataport.de>

.bash_extra

@@ -283,7 +283,7 @@ alias gs="git status"
 alias gf="git fetch"
 alias gdel="git reset --hard ; git clean -f"
 alias glast="git log -1 HEAD --stat"
-alias gd="git diff"
+alias gd="git difftool"
 alias gsp="git stage -p"
 # docker
 alias dcu="docker-compose up"

.gitconfig

@@ -38,3 +38,6 @@ addEmptyPathspec   = false
 	gpgsign = true
 [rerere]
 	enabled = true
+[diff]
+        tool = vimdiff
+

.vimrc

@@ -34,6 +34,8 @@ Plugin 'ConradIrwin/vim-bracketed-paste'
 Plugin 'mbbill/undotree'
 " highlight yanked text
 Plugin 'machakann/vim-highlightedyank'
+" nord theme für vimdiff
+Plugin 'nordtheme/vim'
 call vundle#end()
 
 let mapleader = ","
@@ -228,3 +230,8 @@ endfunction
 " yaml einrückung
 autocmd FileType yaml setlocal ai ts=2 sw=2 et
 autocmd FileType yml setlocal ai ts=2 sw=2 et
+
+" set colorscheme for vimdiff
+if &diff
+    colorscheme nord
+endif