diff options
| -rwxr-xr-x | bin/git_diff | 5 | ||||
| -rw-r--r-- | gitconfig | 3 | ||||
| -rw-r--r-- | vimrc | 5 |
3 files changed, 8 insertions, 5 deletions
diff --git a/bin/git_diff b/bin/git_diff index 6193650..8b6d242 100755 --- a/bin/git_diff +++ b/bin/git_diff @@ -4,7 +4,7 @@ # From https://stackoverflow.com/a/7669988/3805440, thanks # side-by-side diff with custom options: -# /usr/bin/sdiff -w200 -l "$2" "$5" +#/usr/bin/sdiff -w200 -l "$2" "$5" # using kdiff3 as the side-by-side diff: /usr/bin/kdiff3 "$2" "$5" @@ -13,5 +13,4 @@ #/usr/bin/meld "$2" "$5" # using VIM -#/usr/bin/vimdiff "$2" "$5" - +#/usr/bin/nvim -d "$2" "$5" @@ -8,7 +8,6 @@ [core] excludesfile = ~/.gitignore autocrlf = input - pager = /usr/share/doc/git/contrib/diff-highlight/diff-highlight | less --tabs=4 -RFX [diff] external = ~/bin/git_diff [merge] @@ -18,3 +17,5 @@ insteadOf = salsa: [credential] helper = cache +[init] + defaultBranch = main @@ -1,5 +1,5 @@ " vimrc of Johannes Ranke -" Last Change: Tue Dec 15, 2020 at 12:02 PM +0100 +" Last Change: Wed Jan 13, 2021 at 10:16 AM +0100 " default settings (much is handled by tpope/sensible) {{{1 set ts=2 set sw=2 @@ -44,6 +44,9 @@ Plug 'seb-mueller/kwbdi.vim' " Version control Plug 'tpope/vim-fugitive' Plug 'airblade/vim-gitgutter' +Plug 'samoshkin/vim-mergetool' +let g:mergetool_layout = 'mr' +let g:mergetool_prefer_revision = 'local' " File system exploration Plug 'scrooloose/nerdtree' |