Use Vim as git diff and merge tool

This page cannot be shown here. You can still read it on the original site — the toolbar below keeps your place in the directory.

When working on remote servers, GUI-based diff and merge tools are uaually a luxury we cannot afford. In such a situation, vim is often what we can rely on, because it is installed by default by almost all distributions. It is useful to learn how to do git diff and git merge from terminal with only vim. Configuration Put the following in .bashrc, so that vimdiff always uses the vim found in $PATH,…

Read on /vim/2025/01/01/use-vim-as-git-diff-and-merge-tool.html ↗