Vimdiff

Vim is a very efficient text editor. This reference was made for Vim 8.0.

A cheatsheet by @rstacruz|Refreshed about 3 years ago.Refresh|View source on Github

Getting started

Navigating

Navigating

Shortcut Description
]c Next difference
[c Previous difference

Editing

Editing

Shortcut Description
do Diff Obtain!
Pull the changes to the current file.
dp Diff Put!
Push the changes to the other file.
:diffupdate Re-scan the files for differences.
ZQ Quit without checking changes

Folds

Folds

Shortcut Description
zo / zO Open
zc / zC Close
za / zA Toggle
zv Open folds for this line
zM Close all
zR Open all
zm Fold more (foldlevel += 1)
zr Fold less (foldlevel -= 1)
zx Update folds

Also see

This cheat sheet can be found in the following categories:
Vim
12
COLLECTION

Collection of cheat sheets about Vim usage, vim-script, and everything to become super proficient with the Vim editor!