diff options
| -rwxr-xr-x | bin/git_diff | 17 | ||||
| -rw-r--r-- | gitconfig | 4 | ||||
| -rw-r--r-- | vimrc | 4 |
3 files changed, 23 insertions, 2 deletions
diff --git a/bin/git_diff b/bin/git_diff new file mode 100755 index 0000000..6193650 --- /dev/null +++ b/bin/git_diff @@ -0,0 +1,17 @@ +#!/bin/bash +# un-comment one diff tool you'd like to use +# +# From https://stackoverflow.com/a/7669988/3805440, thanks + +# side-by-side diff with custom options: +# /usr/bin/sdiff -w200 -l "$2" "$5" + +# using kdiff3 as the side-by-side diff: +/usr/bin/kdiff3 "$2" "$5" + +# using Meld +#/usr/bin/meld "$2" "$5" + +# using VIM +#/usr/bin/vimdiff "$2" "$5" + @@ -9,8 +9,12 @@ excludesfile = ~/.gitignore autocrlf = input pager = /usr/share/doc/git/contrib/diff-highlight/diff-highlight | less --tabs=4 -RFX +[diff] + external = ~/bin/git_diff [merge] tool = vimdiff [url "git@salsa.debian.org:"] pushInsteadOf = https://salsa.debian.org/ insteadOf = salsa: +[credential] + helper = cache @@ -1,5 +1,5 @@ " vimrc of Johannes Ranke -" Last Change: Wed Nov 04, 2020 at 02:32 PM +0100 +" Last Change: Tue Dec 15, 2020 at 12:02 PM +0100 " default settings (much is handled by tpope/sensible) {{{1 set ts=2 set sw=2 @@ -60,7 +60,7 @@ let R_pdfviewer = 'okular' let R_openpdf = 1 let R_min_editor_width = 100 let R_rconsole_width = 80 -let R_rmdchunk = '``' +"let R_rmdchunk = '``' let R_debug = 0 "let RStudio_cmd = '/usr/bin/rstudio' Plug 'mllg/vim-devtools-plugin' |