git and vimdiff - close all files at once

Question

When using vimdiff with git and lots of changed files, vimdiff will open each file sequentially. It opens up the next file once you have closed the current file.

But what if I just want to break out of the whole diff process and also do not want to have coming diffs open?

How can I stop all diffs when using vimdiff?

The `:cquit` method does not work, even directly. Vim continuous to open new files. — lockdoc, Dec 03 '15 at 11:46

score 44 · Accepted Answer · answered Dec 03 '15 at 11:55

44

OK, I found it.

in .gitconfig:

[difftool]
    # Be able to abort all diffs with `:cq` or `:cquit`
    trustExitCode = true

Then inside vim just enter :cq or :cquit. This will exit vim with error codes and git has been told to rely on the error codes with trustExitCode.

answered Dec 03 '15 at 11:55

lockdoc

1,539
1
18
31

Nice catch (since my link did not help directly). +1 – VonC Dec 03 '15 at 11:57
Your link helped to get me on track. :-) Thanks – lockdoc Dec 03 '15 at 12:04
In my case, the `:cq` command worked even without having the `[difftool]:trustExitCode` entry in `.gitconfig` :) – lonelyjoe Jun 07 '21 at 21:50

score 10 · Answer 2 · answered Feb 01 '16 at 23:27

10

How can I stop all diffs when using vimdiff?

Probably no need to customize your .gitconfig. Use the vim commands instead:

:qa close all (without saving)
:wqa save all then quit

For both commands you can force the action by adding the ! at the end:

:qa! force quit all (without saving any modifications)
:wqa! force quit all (force saving your modifications)

In vim check :help :qa

answered Feb 01 '16 at 23:27

xaa

818
13
13

4

:qa does not stop vim from opening the files it hasn't opened yet – TCSGrad Nov 06 '17 at 18:47
6

This doesn't answer the question asked but it's what I was looking for! – medley56 Jan 11 '18 at 18:11
to stop all diff `:windo diffoff` should do it. – xaa Dec 08 '21 at 15:55

git and vimdiff - close all files at once

2 Answers2