I have configured git to use `vimdiff`, based on advise I saw on the Internet some time ago: git config --global diff.tool vimdiff git config --global diff

I have configured git to use `vimdiff`, based on advise I saw on the Internet some time ago: git config --global diff.tool vimdiff git config --global difftool.prompt false Typing `git difftool` yields the expected behavior. :qa in vim cycles to the next file in the changeset without saving anything. Also, by default, git calls vimdiff with the -R option. You can override it with git config --global difftool.vimdiff.cmd 'vimdiff "$LOCAL" "$REMOTE"' This will open vimdiff in writeable mode which allows edits while diffing. :wq in vim cycles to the next file in the changeset with changes saved.