How do you cancel an external git diff?

by

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 you must edit your gitconfig:

git config --global difftool.trustExitCode true
git config --global mergetool.trustExitCode true

More Related Contents:

  1. Viewing all `git diffs` with vimdiff
  2. How do I make git use the editor of my choice for commits?
  3. How do I make git use the editor of my choice for editing commit messages?
  4. How to set up a git project to use an external repo submodule?
  5. How can I visualize per-character differences in a unified diff file?
  6. Highlight changed lines and changed bytes in each changed line
  7. GnuTLS recv error (-110): The TLS connection was non-properly terminated
  8. HEAD and ORIG_HEAD in Git
  9. LF will be replaced by CRLF in git – What is that and is it important? [duplicate]
  10. How to convert a normal Git repository to a bare one?
  11. How can I push a specific commit to a remote, and not previous commits?
  12. Why do I have to “git push –set-upstream origin “?
  13. Rollback to an old Git commit in a public repo
  14. Git push results in “Authentication Failed”
  15. Add line break to ‘git commit -m’ from the command line
  16. Resolving a Git conflict with binary files
  17. Move branch pointer to different commit without checkout
  18. How do I tell git-svn about a remote branch created after I fetched the repo?
  19. Is there a way to configure git repository to reject ‘git push –force’?
  20. Hash collision in git
  21. Local executing hook after a git push?
  22. Cannot push Git to remote repository with http/https
  23. Git failed with a > fatal error. could not read Username for
  24. git rebase basics
  25. Git: Ignore tracked files
  26. How can I revert uncommitted changes including files and folders?
  27. How to list all tags that contain a commit?
  28. Are multiple `.gitignore`s frowned on?
  29. How to check for changes on remote (origin) Git repository
  30. How to know if there is a git rebase in progress?

Leave a Comment