Git

Last Updated: 7/25/2023

Visual Diff Tools

  • KDiff3
  • P4Merge
  • WinMerge (Windows only)
  • VSCode

Configure VS Code as diff tool

git config --global diff.tool vscode
git config --global difftool.vscode.cmd "code --wait --diff $LOCAL $REMOTE"
git config --global -e
  • VS Code opens and shows .gitconfig file, add $LOCAL and $REMOTE if missing

Changes in Stage

git difftool --staged

Changes in Working directory (Unstaged changes)

git difftool
Previous
Next