Salokyn/vimdiff_cheet.md

Forked from roothybrid7/vimdiff_cheet.md

Last active March 10, 2020 15:26

Star (1) You must be signed in to star a gist
Fork (0) You must be signed in to fork a gist

Select an option

Learn more about clone URLs
Clone this repository at <script src="https://gist.github.com/Salokyn/1671013e73e8038f4f0219ec37a91426.js"></script>
Save Salokyn/1671013e73e8038f4f0219ec37a91426 to your computer and use it in GitHub Desktop.

Download ZIP

vimdiff cheet sheets.

Raw

vimdiff_cheet.md

Vimdiff cheet sheets

Git mergetool

$ git config --global merge.tool=vimdiff

vimdiff key mappings

" vimdiff diffget mappings.
map <Leader>1 :diffget LOCAL<CR>
map <Leader>2 :diffget BASE<CR>
map <Leader>3 :diffget REMOTE<CR>

vimdiff Commands

]c - next difference
[c - previous difference
Ctrl+w+w - switch windows
do - diff obtain
dp - diff put
zo - open folded text
zc - close folded text
:diffupdate - re-scan the files for differences

Moving between windows

Ctrl+W h move to the window on the left
Ctrl+W j move to the window below
Ctrl+W k move to the window above
Ctrl+W l move to the window on the right
Ctrl+W t move to the TOP window
Ctrl+W b move to the BOTTOM window

Moving windows

Ctrl+W K move window to the upper
Ctrl+W H move window to the far left
Ctrl+W J move window to the bottom
Ctrl+W L move window to the far right

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment