From c2521eb547292c914e6422c22a7f2a5d990638a6 Mon Sep 17 00:00:00 2001 From: Oliver Ladner Date: Wed, 7 Mar 2018 16:23:34 +0100 Subject: [PATCH] - vim: disable numbers - git: use vimdiff for diffs --- .gitconfig | 3 +++ .vimrc | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitconfig b/.gitconfig index 5f7e866..6138348 100644 --- a/.gitconfig +++ b/.gitconfig @@ -13,3 +13,6 @@ [credential] helper = cache --timeout 43200 + +[diff] + tool = vimdiff diff --git a/.vimrc b/.vimrc index d0bae1a..f7d963b 100644 --- a/.vimrc +++ b/.vimrc @@ -22,7 +22,7 @@ set incsearch " Relative line numbers except the current line " Both relativenumber with number works on vim 7.4+ "set relativenumber -set number +"set number let g:solarized_termcolors=256 colorscheme solarized