From 41138afae2b70c21ba48d4de38404bf804bcb0a7 Mon Sep 17 00:00:00 2001 From: Reiner Herrmann Date: Mon, 17 Feb 2020 20:51:23 +0100 Subject: select histogram diff in vim and git Scientifically determined to be the best one for code: https://link.springer.com/article/10.1007/s10664-019-09772-z --- git/gitconfig | 1 + vimrc | 1 + 2 files changed, 2 insertions(+) diff --git a/git/gitconfig b/git/gitconfig index c16794b..01b5277 100644 --- a/git/gitconfig +++ b/git/gitconfig @@ -9,6 +9,7 @@ [diff] renames = copy + algorithm = histogram [advice] statusHints = false diff --git a/vimrc b/vimrc index 7f36d3a..d503268 100644 --- a/vimrc +++ b/vimrc @@ -29,6 +29,7 @@ set tags^=./.git/tags; " upwards search for tags file in .git/ set wildmenu " enable wildmenu for command completion set wildmode=list:longest,full " use a bash-like command completion mode set backspace=indent,eol,start " enable backspacing +set diffopt^=indent-heuristic,algorithm:histogram " better diffing set grepprg=rg\ --vimgrep\ --no-heading\ --smart-case " use ripgrep for grepping let mapleader="," " more convenient leader syntax on " enable syntax highlighting -- cgit v1.2.3