diff options
-rw-r--r-- | .bashrc | 1 | ||||
-rw-r--r-- | .vimrc | 6 |
2 files changed, 6 insertions, 1 deletions
@@ -104,7 +104,6 @@ alias fname='find -name' alias mk='make -j$( \ nproc --ignore=1 2>/dev/null \ || sed "s|.*\([0-9]\+\)$|\1|" /sys/devices/system/cpu/online; )' -alias vimdiff='vimdiff -u NONE' # internal, debug, etc. alias hist-del-last='history -d $(history 1 | cut -d" " -f2)' # historical NOOP @@ -48,6 +48,12 @@ let NERDTreeIgnore = ['\.pyc$', '\.tar\.gz$'] " " others " +if &diff + " pass setting shell for vimdiff as it caused auto-stop for some reason +else + " normal mode + set shell=/bin/bash\ -i +endif " http://vim.wikia.com/wiki/Always_start_on_first_line_of_git_commit_message au FileType gitcommit au! BufEnter COMMIT_EDITMSG call setpos('.', [0, 1, 1, 0]) |