From b38069598176016a9e0c76fc30564253e3bb603c Mon Sep 17 00:00:00 2001 From: Max Christian Pohle Date: Thu, 5 Apr 2018 22:08:56 +0200 Subject: Fixed problems with git diff bash command --- bashrc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bashrc b/bashrc index 30d1bf4..d0ac36c 100644 --- a/bashrc +++ b/bashrc @@ -1,6 +1,6 @@ -gvim () { /bin/gvim $(if [[ "$#" > 0 && `/bin/gvim --serverlist | wc -l` ]]; then echo --remote; fi) $@; } -vim () { /bin/vim $(if [[ "$#" > 0 && `/bin/vim --serverlist | wc -l` ]]; then echo --remote; fi) $@; } +# gvim () { /bin/gvim $(if [[ "$#" > 0 && `/bin/gvim --serverlist | wc -l` ]]; then echo --remote; fi) $@; } +# vim () { /bin/vim $(if [[ "$#" > 0 && `/bin/vim --serverlist | wc -l` ]]; then echo --remote; fi) $@; } # man() # { @@ -9,10 +9,10 @@ vim () { /bin/vim $(if [[ "$#" > 0 && `/bin/vim --serverlist | wc -l` ]]; the # ":enew:0read !groffer --pager='cat' --tty $1 col -bx :set filetype=man buftype=nowrite readonlygg"; # } -export MANPAGER='vim -c":%!col -b" -c":file man|:setlocal filetype=man buftype=nowrite readonly nonumber nolist signcolumn=no" -' +export MANPAGER='vim -c":set noswapfile|%!col -b" -c":file man|:setlocal filetype=man buftype=nowrite readonly nonumber nolist signcolumn=no" -' # man() { /bin/vim ":enew:0read !groffer --pager='cat' --tty $1 col -bx :set filetype=man buftype=nowrite readonlygg" -; } alias git='git -c color.ui=false' -export GIT_PAGER='vim -c":set filetype=git buftype=nowrite readonly nolist nonumber signcolumn=no|:file git" -' +export GIT_PAGER='vim -c":set noswapfile filetype=git buftype=nowrite readonly nolist nonumber signcolumn=no|:file git" -' # alias git="TERM=dumb git" -- cgit v1.2.3