Search code examples
gitgit-diffvimdiffgit-difftool

Can I abort git difftool when multiple files are being compared?

I've made a huge mistake.

I've configured git difftool to use vimdiff, and then I've executed a command that compares the entire repository:

git difftool tag1 tag2

Now the difftool launches vim in diff mode for each file that has changed. When I close vim, it is launched again with the next pair of files. In general this is what I want, but can I abort this process somehow if there are too many files in the queue? I know I can close the terminal, but is there a better way?

Solution

  • Run this: git config --global difftool.prompt true. That will prompt you for each pair of files it opens.