Use :cquit to exit vim with an error code. Git will detect the error and stop opening new vimdiffs. You’ll probably want to create a mapping for it in your .vimrc: if &diff map Q :cquit<CR> endif Then just hit Q to early abort from a git diff run. In order for this to work … Read more
git config –global diff.tool vimdiff git config –global difftool.prompt false Typing git difftool yields the expected behavior. Navigation commands, :qa in vim cycles to the next file in the changeset without saving anything. Aliasing (example) git config –global alias.d difftool .. will let you type git d to invoke vimdiff. Advanced use-cases, By default, git … Read more